From 3252e9dabfff067c23bf4e5792ee91c93676e411 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 1 Mar 2008 12:36:06 +0100 Subject: [PATCH] --- yaml --- r: 89608 b: refs/heads/master c: 38275ac36d60882db750d6301ef507881b4c8420 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/ohci1394.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 53800fcf0320..76d102e2ed10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2ace29fa44589da51fedc06a67b3f05301f3bfd +refs/heads/master: 38275ac36d60882db750d6301ef507881b4c8420 diff --git a/trunk/drivers/ieee1394/ohci1394.c b/trunk/drivers/ieee1394/ohci1394.c index 969de2a2d633..b4cad9f45862 100644 --- a/trunk/drivers/ieee1394/ohci1394.c +++ b/trunk/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 */