[PATCH net-next v5 1/3] net: phy: modify assignment to OR for dev_flags in phy_attach_direct

Tao Ren taoren at fb.com
Fri Aug 9 09:47:59 AEST 2019


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 <andrew at lunn.ch>
CC: Heiner Kallweit <hkallweit1 at gmail.com>
CC: Vladimir Oltean <olteanv at gmail.com>
Signed-off-by: Tao Ren <taoren at fb.com>
Reviewed-by: Andrew Lunn <andrew at lunn.ch>
---
 Changes:
  - nothing is changed in v1-v4: it's given v5 to align with v5 of the
    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 7ddd91df99e3..252a712d1b2b 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



More information about the openbmc mailing list