Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: fix oops on "modprobe -r ohci1394" after network class_device conversion
This commit is contained in:
commit
cad6a84a39
|
@ -584,7 +584,10 @@ static void ether1394_add_host (struct hpsb_host *host)
|
|||
}
|
||||
|
||||
SET_MODULE_OWNER(dev);
|
||||
#if 0
|
||||
/* FIXME - Is this the correct parent device anyway? */
|
||||
SET_NETDEV_DEV(dev, &host->device);
|
||||
#endif
|
||||
|
||||
priv = netdev_priv(dev);
|
||||
|
||||
|
|
Loading…
Reference in a new issue