]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
cris-build-fixes-update-eth_v10c-ethernet-driver-fix
authorAndrew Morton <akpm@linux-foundation.org>
Thu, 15 Nov 2007 01:00:58 +0000 (17:00 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 15 Nov 2007 02:45:45 +0000 (18:45 -0800)
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>
drivers/net/cris/eth_v10.c

index 26ffa810e5810645c7a2409f5f3b86ac48e91ece..5dc984a3e0054625b0e9770d96b689394dbf7082 100644 (file)
@@ -1088,6 +1088,8 @@ e100_set_duplex(struct net_device* dev, enum duplex new_duplex)
 static int
 e100_probe_transceiver(struct net_device* dev)
 {
 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;
 #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;
        }
                                      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);
 
        /* 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;
                        break;
        }
        transceiver = ops;
-
+out:
        spin_unlock(&np->transceiver_lock);
 #endif
        spin_unlock(&np->transceiver_lock);
 #endif
-       return 0;
+       return ret;
 }
 
 static int
 }
 
 static int