From: Nithin Sujir <nsujir@broadcom.com>
Date: Fri, 20 Sep 2013 23:46:59 +0000 (-0700)
Subject: tg3: Remove redundant if check
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4bc814ab71951cab2dd745c08772ed2eb849a5f8;p=linux-beck.git

tg3: Remove redundant if check

Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index a1a07f3ad4ad..00431bcefc41 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -9203,10 +9203,7 @@ static int tg3_halt(struct tg3 *tp, int kind, bool silent)
 		memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
 	}
 
-	if (err)
-		return err;
-
-	return 0;
+	return err;
 }
 
 static int tg3_set_mac_addr(struct net_device *dev, void *p)