ieee1394: ohci1394: switch on bus power after resume on PPC PMac
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sat, 1 Mar 2008 11:36:06 +0000 (12:36 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Fri, 18 Apr 2008 15:55:30 +0000 (17:55 +0200)
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>
drivers/ieee1394/ohci1394.c

index 969de2a2d633450bc8aad554c53f7bd740672ccc..b4cad9f45862f7c61bc8c2c18ce792878f2aaba8 100644 (file)
@@ -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 */