summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNithin Sujir <nsujir@broadcom.com>2013-09-20 16:46:59 -0700
committerDavid S. Miller <davem@davemloft.net>2013-09-21 14:04:52 -0400
commit4bc814ab71951cab2dd745c08772ed2eb849a5f8 (patch)
tree936ccc9b1ecfc8e9a95b0bee475665b31aaf5383
parentdb79e1e93e1215d38ff93e9cbb898fba75fd72f4 (diff)
downloadblackbird-op-linux-4bc814ab71951cab2dd745c08772ed2eb849a5f8.tar.gz
blackbird-op-linux-4bc814ab71951cab2dd745c08772ed2eb849a5f8.zip
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>
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c5
1 files changed, 1 insertions, 4 deletions
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)
OpenPOWER on IntegriCloud