[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tkrat.ffa17a046c55daa9@s5r6.in-berlin.de>
Date: Sat, 1 Mar 2008 12:34:50 +0100 (CET)
From: Stefan Richter <stefanr@...6.in-berlin.de>
To: linux1394-devel@...ts.sourceforge.net
cc: linuxppc-dev@...abs.org, linux-kernel@...r.kernel.org,
benh@...nel.crashing.org
Subject: [PATCH 1/4] 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@...6.in-berlin.de>
---
drivers/firewire/fw-ohci.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: linux/drivers/firewire/fw-ohci.c
===================================================================
--- linux.orig/drivers/firewire/fw-ohci.c
+++ linux/drivers/firewire/fw-ohci.c
@@ -2259,8 +2259,10 @@ static int pci_suspend(struct pci_dev *p
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 */
@@ -2277,8 +2279,10 @@ static int pci_resume(struct pci_dev *pd
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 */
--
Stefan Richter
-=====-==--- --== ----=
http://arcgraph.de/sr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists