From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 26 Nov 2008 00:48:42 +0000 (-0800)
Subject: niu: fix another warning in drivers/net/niu.c
X-Git-Tag: v2.6.29-rc1~581^2~478
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f166400bd4c92df72d997e0da8713fae90d56e57;p=linux-2.6-omap-h63xx.git

niu: fix another warning in drivers/net/niu.c

this warning:

  drivers/net/niu.c: In function ‘esr_reset’:
  drivers/net/niu.c:741: warning: ‘reset’ may be used uninitialized in this function

triggers because GCC does not recognize the (correct) error flow
between:

 - esr_read_reset() and 'reset'

Annotate it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 5b7b31d25be..2f98f7a4117 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -738,7 +738,7 @@ static int esr_write_glue0(struct niu *np, unsigned long chan, u32 val)
 
 static int esr_reset(struct niu *np)
 {
-	u32 reset;
+	u32 uninitialized_var(reset);
 	int err;
 
 	err = mdio_write(np, np->port, NIU_ESR_DEV_ADDR,