devices/8139too-2.6.35-ethercat.c
changeset 2589 2b9c78543663
parent 2054 3417bbc4ad2f
--- a/devices/8139too-2.6.35-ethercat.c	Thu Sep 06 14:21:02 2012 +0200
+++ b/devices/8139too-2.6.35-ethercat.c	Mon Nov 03 15:20:05 2014 +0100
@@ -648,7 +648,7 @@
 	struct mii_if_info	mii;
 	unsigned int		regs_len;
 	unsigned long		fifo_copy_timeout;
-    
+
 	ec_device_t *ecdev;
 };
 
@@ -1136,9 +1136,12 @@
 	if (rtl_chip_info[tp->chipset].flags & HasHltClk)
 		RTL_W8 (HltClk, 'H');	/* 'R' would leave the clock running. */
 
-	if (tp->ecdev && ecdev_open(tp->ecdev)) {
-		ecdev_withdraw(tp->ecdev);
-		goto err_out;
+	if (tp->ecdev) {
+		i = ecdev_open(tp->ecdev);
+		if (i) {
+			ecdev_withdraw(tp->ecdev);
+			goto err_out;
+		}
 	}
 
 	return 0;
@@ -1801,8 +1804,7 @@
 		wmb();
 		RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
 			tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
- 
- 
+
 		tp->cur_tx++;
 	} else {
 		spin_lock_irqsave(&tp->lock, flags);