[PATCH 1/2] ieee1394: ohci1394: add PPC_PMAC platform code to driver probe
flat view
STALE7277d
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: 2006-11-10 22:43:58
Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7431 : iBook G3 threw a machine check exception and put the display backlight to full brightness after ohci1394 was unloaded and reloaded. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> --- drivers/ieee1394/ohci1394.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) Index: linux/drivers/ieee1394/ohci1394.c ===================================================================
--- linux.orig/drivers/ieee1394/ohci1394.c 2006-11-08 18:19:56.000000000 +0100
+++ linux/drivers/ieee1394/ohci1394.c 2006-11-10 23:25:04.000000000 +0100@@ -3215,6 +3215,18 @@ static int __devinit ohci1394_pci_probe( struct ti_ohci *ohci; /* shortcut to currently handled device */ resource_size_t ohci_base; +#ifdef CONFIG_PPC_PMAC + /* Necessary on some machines if ohci1394 was loaded/ unloaded before */ + if (machine_is(powermac)) { + struct device_node *of_node = pci_device_to_OF_node(dev); + + if (of_node) + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node, + 0, 1); + pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 1); + } +#endif /* CONFIG_PPC_PMAC */ + if (pci_enable_device(dev)) FAIL(-ENXIO, "Failed to enable OHCI hardware"); pci_set_master(dev);
@@ -3503,10 +3515,8 @@ static void ohci1394_pci_remove(struct p #endif #ifdef CONFIG_PPC_PMAC - /* On UniNorth, power down the cable and turn off the chip - * clock when the module is removed to save power on - * laptops. Turning it back ON is done by the arch code when - * pci_enable_device() is called */ + /* On UniNorth, power down the cable and turn off the chip clock + * to save power on laptops */ { struct device_node* of_node;