diff options
| author |   Tao Ren <taoren@fb.com> | 2019-10-22 11:31:06 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-23 20:42:52 -0700 |
| commit | e7312efbd5dec50d791dd98bd92ec9ae4f05a832 (patch) | |
| tree | 321234c1b9791afce6b32dd7af897bb9457d136c /drivers | |
| parent | fq_codel: do not include <linux/jhash.h> (diff) | |
| download | linux-dev-e7312efbd5dec50d791dd98bd92ec9ae4f05a832.tar.xz linux-dev-e7312efbd5dec50d791dd98bd92ec9ae4f05a832.zip | |
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 <andrew@lunn.ch>
CC: Heiner Kallweit <hkallweit1@gmail.com>
CC: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Tao Ren <taoren@fb.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index adb66a2fae18..f1f60bd4865a 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; |