--- a/devices/forcedeth-2.6.17-ethercat.c Tue Jun 17 09:44:46 2008 +0000
+++ b/devices/forcedeth-2.6.17-ethercat.c Tue Jun 17 10:19:52 2008 +0000
@@ -3336,18 +3336,13 @@
np->autoneg = 1;
// offer device to EtherCAT master module
- if (ecdev_offer(dev, ec_poll, THIS_MODULE, &np->ecdev)) {
- printk(KERN_ERR "forcedeth: Failed to offer device.\n");
- goto out_freering;
- }
-
+ np->ecdev = ecdev_offer(dev, ec_poll, THIS_MODULE);
if (np->ecdev) {
if (ecdev_open(np->ecdev)) {
ecdev_withdraw(np->ecdev);
goto out_freering;
}
- }
- else {
+ } else {
err = register_netdev(dev);
if (err) {
printk(KERN_INFO "forcedeth: unable to register netdev: %d\n", err);