From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 15 Oct 2007 21:02:21 +0000 (-0700)
Subject: e1000e: fix error checks
X-Git-Tag: v2.6.24-rc1~819^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e265522ca7d7a0cfa24aa2c811d22a1764a90783;p=linux-2.6-omap-h63xx.git

e1000e: fix error checks

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index b7a7e2ae5e1..ca06c354b53 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1451,11 +1451,11 @@ static int e1000_loopback_test(struct e1000_adapter *adapter, u64 *data)
 	}
 
 	*data = e1000_setup_desc_rings(adapter);
-	if (data)
+	if (*data)
 		goto out;
 
 	*data = e1000_setup_loopback_test(adapter);
-	if (data)
+	if (*data)
 		goto err_loopback;
 
 	*data = e1000_run_loopback_test(adapter);