devices/e1000e/netdev-3.6-ethercat.c
branchstable-1.5
changeset 2582 87e502828b3f
parent 2546 2fa43746d972
--- a/devices/e1000e/netdev-3.6-ethercat.c	Mon Oct 27 14:55:50 2014 +0100
+++ b/devices/e1000e/netdev-3.6-ethercat.c	Mon Oct 27 16:33:23 2014 +0100
@@ -6540,11 +6540,12 @@
 
 	adapter->ecdev = ecdev_offer(netdev, ec_poll, THIS_MODULE);
 	if (adapter->ecdev) {
-		adapter->ec_watchdog_jiffies = jiffies;
-		if (ecdev_open(adapter->ecdev)) {
+		err = ecdev_open(adapter->ecdev);
+		if (err) {
 			ecdev_withdraw(adapter->ecdev);
 			goto err_register;
 		}
+		adapter->ec_watchdog_jiffies = jiffies;
 	} else {
 		strlcpy(netdev->name, "eth%d", sizeof(netdev->name));
 		err = register_netdev(netdev);