Commit e7312efb authored Oct 22, 2019 by Tao Ren Committed by David S. Miller Oct 23, 2019

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>

parent 406715df

drivers/net/phy/phy_device.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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_err(phydev, "error creating 'phy_standalone' sysfs entry\n");
	}		}

	phydev->dev_flags = flags;		phydev->dev_flags \|= flags;

	phydev->interface = interface;		phydev->interface = interface;

Admin message