The error checks in the suspend code were too harsh and broke
suspend on some PPC_PMACs again which have extra platform code.
Signed-off-by: Stefan Richter <[email protected]>
---
Index: linux/drivers/ieee1394/ohci1394.c
===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c 2006-10-25 09:22:05.000000000 +0200
+++ linux/drivers/ieee1394/ohci1394.c 2006-10-25 09:25:36.000000000 +0200
@@ -3534,6 +3534,9 @@ static int ohci1394_pci_suspend(struct p
int err;
struct ti_ohci *ohci = pci_get_drvdata(pdev);
+ printk(KERN_INFO "%s does not fully support suspend yet\n",
+ OHCI1394_DRIVER_NAME);
+
PRINT(KERN_DEBUG, "suspend called");
if (!ohci)
return -ENXIO;
@@ -3558,11 +3561,17 @@ static int ohci1394_pci_suspend(struct p
ohci_soft_reset(ohci);
err = pci_save_state(pdev);
- if (err)
+ if (err) {
+ printk(KERN_ERR "%s: pci_save_state failed with %d\n",
+ OHCI1394_DRIVER_NAME, err);
return err;
+ }
err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+#ifdef OHCI1394_DEBUG
if (err)
- return err;
+ printk(KERN_DEBUG "%s: pci_set_power_state failed with %d\n",
+ OHCI1394_DRIVER_NAME, err);
+#endif /* OHCI1394_DEBUG */
/* PowerMac suspend code comes last */
#ifdef CONFIG_PPC_PMAC
-
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]
