summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2008-03-01 12:36:06 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2008-04-18 17:55:30 +0200
commit38275ac36d60882db750d6301ef507881b4c8420 (patch)
treebef08ba7865fdc5e9e218b6cce231fd897dafdbf
parentd2ace29fa44589da51fedc06a67b3f05301f3bfd (diff)
ieee1394: ohci1394: switch on bus power after resume on PPC PMac
The platform feature calls in the suspend method switched off cable power, but the calls in the resume method did not switch it back on. Add the necessary feature call to .resume. Also add the corresponding call to .suspend to make .suspend's behavior explicitly the same on all PMacs. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/ohci1394.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 969de2a2d63..b4cad9f4586 100644
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
@@ -3340,8 +3340,10 @@ static int ohci1394_pci_suspend(struct pci_dev *pdev, pm_message_t state)
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(pdev);
- if (ofn)
+ if (ofn) {
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 0);
+ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 0);
+ }
}
#endif /* CONFIG_PPC_PMAC */
@@ -3365,8 +3367,10 @@ static int ohci1394_pci_resume(struct pci_dev *pdev)
if (machine_is(powermac)) {
struct device_node *ofn = pci_device_to_OF_node(pdev);
- if (ofn)
+ if (ofn) {
+ pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, ofn, 0, 1);
pmac_call_feature(PMAC_FTR_1394_ENABLE, ofn, 0, 1);
+ }
}
#endif /* CONFIG_PPC_PMAC */