From bf0bbfdc928e63a2fdff1eaa9ddad1c15dc32672 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 1 Mar 2008 12:34:50 +0100 Subject: [PATCH] --- yaml --- r: 89627 b: refs/heads/master c: eb5ca72effaa7f691f7df5187c5c5d1268311326 h: refs/heads/master i: 89625: 1e6c563155913e5d303a5285d9a2885b22727684 89623: c97b8eccfa040865c4ef34a2b27e169982fb1920 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-ohci.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 770fd948d353..533aecc58304 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 080de8c2c57e3199eee837fe8b6d35a43679f8c1 +refs/heads/master: eb5ca72effaa7f691f7df5187c5c5d1268311326 diff --git a/trunk/drivers/firewire/fw-ohci.c b/trunk/drivers/firewire/fw-ohci.c index 5da7c6715e1e..312182d6d970 100644 --- a/trunk/drivers/firewire/fw-ohci.c +++ b/trunk/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 */