diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-17 05:21:24 +0200 |
| commit | da8120355e80ddaf534adb8ed910871d97512d56 (patch) | |
| tree | 9958a6c33e29b5af5faccf6650e98729151618a2 /drivers/net/phy | |
| parent | gianfar: remove unused DECLARE_MAC_BUF (diff) | |
| parent | cdc-eem: bad crc checking (diff) | |
| download | linux-da8120355e80ddaf534adb8ed910871d97512d56.tar.xz linux-da8120355e80ddaf534adb8ed910871d97512d56.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/orinoco/main.c
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index eba937c46376..b10fedd82143 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -134,8 +134,10 @@ int phy_scan_fixups(struct phy_device *phydev) err = fixup->run(phydev); - if (err < 0) + if (err < 0) { + mutex_unlock(&phy_fixup_lock); return err; + } } } mutex_unlock(&phy_fixup_lock); |