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

From: Tao Ren
Date: Fri Aug 09 2019 - 01:47:10 EST

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@xxxxxxx>
CC: Heiner Kallweit <hkallweit1@xxxxxxxxx>
CC: Vladimir Oltean <olteanv@xxxxxxxxx>
Signed-off-by: Tao Ren <taoren@xxxxxx>
Reviewed-by: Andrew Lunn <andrew@xxxxxxx>
- nothing is changed in v1-v5: it's given v6 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 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;