aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/hosts.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-03-26 19:36:50 -0400
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-29 18:00:30 -0400
commit70093cfde8af52b0b9030d90f9004cbde38f2ff8 (patch)
treef9230ca354e78b129898298095a6ee887c40a16d /drivers/ieee1394/hosts.c
parente00f04a70fa387b3accc81b5c346200f836e2a52 (diff)
ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts
Until now, ieee1394 put an IP-over-1394 capability entry into each new host's config ROM. As soon as the controller was initialized --- i.e. right after modprobe ohci1394 --- this entry triggered a hotplug event which typically caused auto-loading of eth1394. This irritated or annoyed many users and distributors. Of course they could blacklist eth1394, but then ieee1394 wrongly advertized IP-over- 1394 capability to the FireWire bus. Therefore - remove the offending kernel config option IEEE1394_CONFIG_ROM_IP1394, - let eth1394 add the ROM entry by itself, i.e. only after eth1394 was loaded. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7793 . To emulate the behaviour of older kernels, simply add the following to to /etc/modprobe.conf: install ohci1394 /sbin/modprobe eth1394; \ /sbin/modprobe --ignore-install ohci1394 Note, autoloading of eth1394 when an _external_ IP-over-1394 capable device is discovered is _not_ affected by this patch. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/hosts.c')
-rw-r--r--drivers/ieee1394/hosts.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
index 1bf4aa3e8d15..6164a9a83396 100644
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@ -180,7 +180,7 @@ int hpsb_add_host(struct hpsb_host *host)
180{ 180{
181 if (hpsb_default_host_entry(host)) 181 if (hpsb_default_host_entry(host))
182 return -ENOMEM; 182 return -ENOMEM;
183 hpsb_add_extra_config_roms(host); 183
184 highlevel_add_host(host); 184 highlevel_add_host(host);
185 return 0; 185 return 0;
186} 186}
@@ -202,7 +202,6 @@ void hpsb_remove_host(struct hpsb_host *host)
202 202
203 host->driver = &dummy_driver; 203 host->driver = &dummy_driver;
204 highlevel_remove_host(host); 204 highlevel_remove_host(host);
205 hpsb_remove_extra_config_roms(host);
206 205
207 class_device_unregister(&host->class_dev); 206 class_device_unregister(&host->class_dev);
208 device_unregister(&host->device); 207 device_unregister(&host->device);