summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-10-29 19:52:49 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 21:32:36 +0100
commit2a3f8ad3a94c784f57958bd692428cb342ce4114 (patch)
tree5ecd1d5a178a38fa1a9671b45aa4fef89be2d17f /drivers/ieee1394
parentdef4d8733b8b8fed521957a7fd546714dd491b91 (diff)
downloadop-kernel-dev-2a3f8ad3a94c784f57958bd692428cb342ce4114.zip
op-kernel-dev-2a3f8ad3a94c784f57958bd692428cb342ce4114.tar.gz
ieee1394: ohci1394: revert fail on error in suspend
Some errors during preparation for suspended state can be skipped with a warning instead of a failure of the whole suspend transition, notably an error in pci_set_power_state. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/ohci1394.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index a128025..44adefd 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3534,6 +3534,9 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
int err;
struct ti_ohci *ohci = pci_get_drvdata(pdev);
+ printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
+ OHCI1394_DRIVER_NAME);
+
PRINT(KERN_DEBUG, "suspend called");
if (!ohci)
return -ENXIO;
@@ -3558,11 +3561,17 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
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
OpenPOWER on IntegriCloud