Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ieee1394: ohci1394: add PPC_PMAC platform code to driver probe

Browse source 
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>
This commit is contained in:
Stefan Richter 2006-11-11 00:22:35 +01:00
parent 58272c1c03
commit 48cfae44b4
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/ieee1394/ohci1394.c
View file

@ -3215,6 +3215,19 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
struct ti_ohci *ohci; /* shortcut to currently handled device */ struct ti_ohci *ohci; /* shortcut to currently handled device */
resource_size_t ohci_base; 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)) if (pci_enable_device(dev))
FAIL(-ENXIO, "Failed to enable OHCI hardware"); FAIL(-ENXIO, "Failed to enable OHCI hardware");
pci_set_master(dev); pci_set_master(dev);
@ -3503,10 +3516,8 @@ static void ohci1394_pci_remove(struct pci_dev *pdev)
#endif #endif
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
/* On UniNorth, power down the cable and turn off the chip /* On UniNorth, power down the cable and turn off the chip clock
* clock when the module is removed to save power on * to save power on laptops */
* laptops. Turning it back ON is done by the arch code when
* pci_enable_device() is called */
{ {
struct device_node* of_node; struct device_node* of_node;