Modify the assignment to OR when dealing with phydev->dev_flags in
phy_attach_direct function, and this is to make sure dev_flags set in
driver's probe callback won't be lost.

Suggested-by: Andrew Lunn <and...@lunn.ch>
CC: Heiner Kallweit <hkallwe...@gmail.com>
CC: Vladimir Oltean <olte...@gmail.com>
Signed-off-by: Tao Ren <tao...@fb.com>
Reviewed-by: Andrew Lunn <and...@lunn.ch>
Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
---
 Changes:
  - nothing is changed in v1-v7: it's given v8 to align with the version
    of patch series.

 drivers/net/phy/phy_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index d347ddcac45b..8933f07d39e9 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1270,7 +1270,7 @@ int phy_attach_direct(struct net_device *dev, struct 
phy_device *phydev,
                        phydev_err(phydev, "error creating 'phy_standalone' 
sysfs entry\n");
        }
 
-       phydev->dev_flags = flags;
+       phydev->dev_flags |= flags;
 
        phydev->interface = interface;
 
-- 
2.17.1

Reply via email to