diff options
| author |   Tao Ren <rentao.bupt@gmail.com> | 2020-06-18 15:04:44 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-06-20 17:33:17 -0700 |
| commit | 902053f17dbeff125926bb07e781f6e63f3efe09 (patch) | |
| tree | 8326cecfa86030dc7199bf3f17d529eba3cc0500 | |
| parent | net: Avoid overwriting valid skb->napi_id (diff) | |
| download | wireguard-linux-902053f17dbeff125926bb07e781f6e63f3efe09.tar.xz wireguard-linux-902053f17dbeff125926bb07e781f6e63f3efe09.zip | |
of: mdio: preserve phy dev_flags in of_phy_connect()
Replace assignment "=" with OR "|=" for "phy->dev_flags" so "dev_flags"
configured in phy probe() function can be preserved.
The idea is similar to commit e7312efbd5de ("net: phy: modify assignment
to OR for dev_flags in phy_attach_direct").
Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/of/of_mdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index a04afe79529c..f5c46c72f4d3 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -380,7 +380,7 @@ struct phy_device *of_phy_connect(struct net_device *dev, if (!phy) return NULL; - phy->dev_flags = flags; + phy->dev_flags |= flags; ret = phy_connect_direct(dev, phy, hndlr, iface); |