diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-11-15 02:00:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-15 03:45:45 +0100 |
| commit | 633edf5a4fff0675851e377cc5f0c9072683a5f4 (patch) | |
| tree | 134c4faff9c3139f93e9b8438177e40a423610af /drivers/net/cris | |
| parent | cris build fixes: update eth_v10.c ethernet driver (diff) | |
| download | linux-633edf5a4fff0675851e377cc5f0c9072683a5f4.tar.xz linux-633edf5a4fff0675851e377cc5f0c9072683a5f4.zip | |
cris-build-fixes-update-eth_v10c-ethernet-driver-fix
Fix locking bug noted by Roel Kluin <12o3l@tiscali.nl>.
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/cris')
| -rw-r--r-- | drivers/net/cris/eth_v10.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 26ffa810e581..5dc984a3e005 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c @@ -1088,6 +1088,8 @@ e100_set_duplex(struct net_device* dev, enum duplex new_duplex) static int e100_probe_transceiver(struct net_device* dev) { + int ret = 0; + #if !defined(CONFIG_ETRAX_NO_PHY) unsigned int phyid_high; unsigned int phyid_low; @@ -1104,8 +1106,10 @@ e100_probe_transceiver(struct net_device* dev) np->mii_if.phy_id, MII_BMSR) != 0xffff) break; } - if (np->mii_if.phy_id == 32) - return -ENODEV; + if (np->mii_if.phy_id == 32) { + ret = -ENODEV; + goto out; + } /* Get manufacturer */ phyid_high = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_PHYSID1); @@ -1117,10 +1121,10 @@ e100_probe_transceiver(struct net_device* dev) break; } transceiver = ops; - +out: spin_unlock(&np->transceiver_lock); #endif - return 0; + return ret; } static int |