aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/ohci1394.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-01-07 15:49:27 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-02-08 14:59:19 -0500
commit3360177c62e86f476c4f1a057e13163383652f7b (patch)
tree4394cb7f4cef0231e371fda119178bde552eec79 /drivers/ieee1394/ohci1394.c
parent083922fe1c277603a03f0ca700fe5a76f11178c7 (diff)
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 b7e816683fb0..5729e412cc4a 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)
3536 int err; 3536 int err;
3537 struct ti_ohci *ohci = pci_get_drvdata(pdev); 3537 struct ti_ohci *ohci = pci_get_drvdata(pdev);
3538 3538
3539 printk(KERN_INFO "%s does not fully support suspend and resume yet\n",
3540 OHCI1394_DRIVER_NAME);
3541
3542 if (!ohci) { 3539 if (!ohci) {
3543 printk(KERN_ERR "%s: tried to suspend nonexisting host\n", 3540 printk(KERN_ERR "%s: tried to suspend nonexisting host\n",
3544 OHCI1394_DRIVER_NAME); 3541 OHCI1394_DRIVER_NAME);
@@ -3625,6 +3622,7 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
3625 mdelay(50); 3622 mdelay(50);
3626 ohci_initialize(ohci); 3623 ohci_initialize(ohci);
3627 3624
3625 hpsb_resume_host(ohci->host);
3628 return 0; 3626 return 0;
3629} 3627}
3630#endif /* CONFIG_PM */ 3628#endif /* CONFIG_PM */