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
master
Hauke Mehrtens 11 years ago
parent 8a1d77efed
commit 091e3fde4c
  1. 2
      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);

Loading…
Cancel
Save