Skip to contentSkip to conversation

e1000e: Fix debug printk macro

PATCH In review Auke Kok 2 participants 3 messages Oct 15, 2007 – Oct 17, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Auke Kok

author
#0 lore raw

PATCH 1/2 e1000e: Fix debug printk macro

Spotted by Joe Perches.

Signed-off-by Auke Kok <[email protected]>

---

 drivers/net/e1000e/hw.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/e1000e/hw.h +1 -1
index aa82f1a..6451578 100644
@@ -852,7 +852,7 @@ struct e1000_hw {
 
 #ifdef DEBUG
 #define hw_dbg(hw, format, arg...) \
-	printk(KERN_DEBUG, "%s: " format, e1000e_get_hw_dev_name(hw), ##arg);
+	printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg)
 #else
 static inline int __attribute__ ((format (printf, 2, 3)))
 hw_dbg(struct e1000_hw *hw, const char *format, ...)
author
#1 lore raw

PATCH 2/2 e1000e: fix error checks

From: Adrian Bunk <[email protected]>

Spotted by the Coverity checker.

Signed-off-by Adrian Bunk <[email protected]>
Signed-off-by Auke Kok <[email protected]>

---

 drivers/net/e1000e/ethtool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000e/ethtool.c +2 -2
index b7a7e2a..ca06c35 100644
@@ -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);