summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/ohci1394.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-01-07 21:49:27 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-02-08 20:59:19 +0100
commit3360177c62e86f476c4f1a057e13163383652f7b (patch)
tree4394cb7f4cef0231e371fda119178bde552eec79 /drivers/ieee1394/ohci1394.c
parent083922fe1c277603a03f0ca700fe5a76f11178c7 (diff)
downloadop-kernel-dev-3360177c62e86f476c4f1a057e13163383652f7b.zip
op-kernel-dev-3360177c62e86f476c4f1a057e13163383652f7b.tar.gz
ieee1394: restore config ROM when resuming
After PM suspend + resume, the local configuration ROM was not restored. This prevented remote nodes from recognizing the resuming machine. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/ohci1394.c')
-rw-r--r--drivers/ieee1394/ohci1394.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index b7e8166..5729e41 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3536,9 +3536,6 @@ 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);
-
if (!ohci) {
printk(KERN_ERR "%s: tried to suspend nonexisting host\n",
OHCI1394_DRIVER_NAME);
@@ -3625,6 +3622,7 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
mdelay(50);
ohci_initialize(ohci);
+ hpsb_resume_host(ohci->host);
return 0;
}
#endif /* CONFIG_PM */
OpenPOWER on IntegriCloud