firewire: fw-ohci: 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>

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 5da7c6715e1eb4dabed99fcedee86903630d1355..312182d6d970804d8047ee539f42ba91c0682b2e 100644 (file)
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -2251,8 +2251,10 @@ static int 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 */
 
@@ -2269,8 +2271,10 @@ static int 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 */