diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 21:23:29 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 21:23:29 +0000 |
commit | 091e3fde4c2fb8d230c2ff2cf1e61ca4a1d03d3d (patch) | |
tree | 7eefc5977d0e7cfdcf15dffd43e52754587e3165 /target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch | |
parent | 8a1d77efed4e915a52e31f6f73a42bd6353353d3 (diff) | |
download | master-31e0f0ae-091e3fde4c2fb8d230c2ff2cf1e61ca4a1d03d3d.tar.gz master-31e0f0ae-091e3fde4c2fb8d230c2ff2cf1e61ca4a1d03d3d.tar.bz2 master-31e0f0ae-091e3fde4c2fb8d230c2ff2cf1e61ca4a1d03d3d.zip |
brcm47xx: b44: fix logic in BUG_ON()
It is a problem when phydev is not set at this position and not the other way around.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38744
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch b/target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch index 2386fbe9a3..8c7ba9ccff 100644 --- a/target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch +++ b/target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch @@ -128,7 +128,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> spin_lock_irq(&bp->lock); - err = generic_mii_ioctl(&bp->mii_if, data, cmd, NULL); + if (bp->flags & B44_FLAG_EXTERNAL_PHY) { -+ BUG_ON(bp->phydev); ++ BUG_ON(!bp->phydev); + err = phy_mii_ioctl(bp->phydev, ifr, cmd); + } else { + err = generic_mii_ioctl(&bp->mii_if, if_mii(ifr), cmd, NULL); |