Greg KH wrote:
> -stable review patch. If anyone has any objections, please let us know.
>
> ------------------
> From: Danny Tholen <[email protected]>
>
> Recently a patch was added for preliminary suspend/resume handling on
> !PPC_PMAC. However, this broke both suspend and firewire on powerpc
> because it saves the pci state after the device has already been disabled.
>
> This moves the save state to before the pmac specific code.
>
> Signed-off-by: Danny Tholen <[email protected]>
> Cc: Stefan Richter <[email protected]>
Acked-by: Stefan Richter <[email protected]>
> Cc: Benjamin Herrenschmidt <[email protected]>
> Cc: Ben Collins <[email protected]>
> Cc: Jody McIntyre <[email protected]>
> Acked-by: Benjamin Herrenschmidt <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> ---
> drivers/ieee1394/ohci1394.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-2.6.17.9.orig/drivers/ieee1394/ohci1394.c
> +++ linux-2.6.17.9/drivers/ieee1394/ohci1394.c
> @@ -3548,6 +3548,8 @@ static int ohci1394_pci_resume (struct p
>
> static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
> {
> + pci_save_state(pdev);
> +
> #ifdef CONFIG_PPC_PMAC
> if (machine_is(powermac)) {
> struct device_node *of_node;
> @@ -3559,8 +3561,6 @@ static int ohci1394_pci_suspend (struct
> }
> #endif
>
> - pci_save_state(pdev);
> -
> return 0;
> }
>
>
> --
--
Stefan Richter
-=====-=-==- =--- =-==-
http://arcgraph.de/sr/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
