diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-04 13:54:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-04 13:54:50 -0700 |
| commit | 5a412ad7f4c95bb5b756aa12b52646e857e7c75d (patch) | |
| tree | cff969a08da663077938e41bdeaa43855e00d4d9 /drivers/net/e100.c | |
| parent | 301102cc832f9f3e24c5748705f152eaa7c307f6 (diff) | |
| parent | 6716344c521bb585c1b89987c918d4b83b81adbe (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index c810cda3bf1f..29f812dc1098 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1512,7 +1512,7 @@ static int e100_phy_init(struct nic *nic) static int e100_hw_init(struct nic *nic) { - int err; + int err = 0; e100_hw_reset(nic); |