/[linux-patches]/genpatches-2.6/tags/2.6.19-3/2300_ieee1394-ppc-reload.patch
Gentoo

Contents of /genpatches-2.6/tags/2.6.19-3/2300_ieee1394-ppc-reload.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 764 - (show annotations) (download)
Wed Dec 13 00:23:17 2006 UTC (11 years, 1 month ago) by dsd
File size: 905 byte(s)
2.6.19-3 release
1 Index: linux/drivers/ieee1394/ohci1394.c
2 ===================================================================
3 --- linux.orig/drivers/ieee1394/ohci1394.c 2006-11-02 22:35:16.000000000 +0100
4 +++ linux/drivers/ieee1394/ohci1394.c 2006-11-05 12:19:52.000000000 +0100
5 @@ -3215,6 +3215,18 @@ static int __devinit ohci1394_pci_probe(
6 struct ti_ohci *ohci; /* shortcut to currently handled device */
7 resource_size_t ohci_base;
8
9 +#ifdef CONFIG_PPC_PMAC
10 + /* Necessary if ohci1394 was loaded and unloaded before */
11 + if (machine_is(powermac)) {
12 + struct device_node *of_node = pci_device_to_OF_node(dev);
13 +
14 + if (of_node)
15 + pmac_call_feature(PMAC_FTR_1394_CABLE_POWER, of_node,
16 + 0, 1);
17 + pmac_call_feature(PMAC_FTR_1394_ENABLE, of_node, 0, 1);
18 + }
19 +#endif /* CONFIG_PPC_PMAC */
20 +
21 if (pci_enable_device(dev))
22 FAIL(-ENXIO, "Failed to enable OHCI hardware");
23 pci_set_master(dev);

  ViewVC Help
Powered by ViewVC 1.1.20