ieee1394: ohci1394: switch on bus power after resume on PPC PMac

[pandora-kernel.git] / drivers / ieee1394 / ohci1394.c

diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
index 969de2a..b4cad9f 100644 (file)
--- 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 */