2019-08-11 23:44:13

by Tao Ren

[permalink] [raw]
Subject: [PATCH net-next v7 1/3] net: phy: modify assignment to OR for dev_flags in phy_attach_direct

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 <[email protected]>
CC: Heiner Kallweit <[email protected]>
CC: Vladimir Oltean <[email protected]>
Signed-off-by: Tao Ren <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
---
Changes:
- nothing is changed in v1-v6: it's given v7 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;

--
2.17.1