of: mdio: preserve phy dev_flags in of_phy_connect()
authorTao Ren <rentao.bupt@gmail.com>
Thu, 18 Jun 2020 22:04:44 +0000 (15:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 21 Jun 2020 00:33:17 +0000 (17:33 -0700)
Replace assignment "=" with OR "|=" for "phy->dev_flags" so "dev_flags"
configured in phy probe() function can be preserved.

The idea is similar to commit e7312efbd5de ("net: phy: modify assignment
to OR for dev_flags in phy_attach_direct").

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/of/of_mdio.c

index a04afe7..f5c46c7 100644 (file)
@@ -380,7 +380,7 @@ struct phy_device *of_phy_connect(struct net_device *dev,
        if (!phy)
                return NULL;
 
-       phy->dev_flags = flags;
+       phy->dev_flags |= flags;
 
        ret = phy_connect_direct(dev, phy, hndlr, iface);