brcm47xx: b44: fix logic in BUG_ON()
authorHauke Mehrtens <hauke@hauke-m.de>
Mon, 11 Nov 2013 21:23:29 +0000 (21:23 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 11 Nov 2013 21:23:29 +0000 (21:23 +0000)
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

target/linux/brcm47xx/patches-3.10/205-b44-add-phylib-support.patch

index 2386fbe9a34757d0de9e843f4aa34a9a4730546b..8c7ba9ccfffdcf1565d9fe8dfe109070b9d72981 100644 (file)
@@ -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);