]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: phy: bcm7xxx: Fix shadow mode 2 disabling
authorFlorian Fainelli <f.fainelli@gmail.com>
Sat, 6 Feb 2016 20:58:48 +0000 (12:58 -0800)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 8 Mar 2016 12:15:39 +0000 (12:15 +0000)
commit 50d899808d33a5b0aa82be23e824119944042689 upstream.

The clear and set masks in the call to phy_set_clr_bits() called from
bcm7xxx_config_init() are inverted. We need to fix this by swapping the two
arguments, that is, set 0 bits, but clear the shade mode 2 enable bit.

Fixes: b560a58c45c66 ("net: phy: add Broadcom BCM7xxx internal PHY driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/net/phy/bcm7xxx.c

index 526b94cea56980633c1d78caabac13004211766f..51678e3937930dc99d7b561c48674eeda6143b4d 100644 (file)
@@ -204,7 +204,7 @@ static int bcm7xxx_config_init(struct phy_device *phydev)
        phy_write(phydev, MII_BCM7XXX_100TX_FALSE_CAR, 0x7555);
 
        /* reset shadow mode 2 */
-       ret = phy_set_clr_bits(phydev, MII_BCM7XXX_TEST, MII_BCM7XXX_SHD_MODE_2, 0);
+       ret = phy_set_clr_bits(phydev, MII_BCM7XXX_TEST, 0, MII_BCM7XXX_SHD_MODE_2);
        if (ret < 0)
                return ret;