2020-06-19 01:14:01

by Tao Ren

Subject: [PATCH net-next] of: mdio: preserve phy dev_flags in of_phy_connect()

From: Tao Ren <[email protected]>

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 <[email protected]>
---
drivers/of/of_mdio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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);

--
2.17.1

2020-06-21 00:35:43

by David Miller

Subject: Re: [PATCH net-next] of: mdio: preserve phy dev_flags in of_phy_connect()

From: [email protected]
Date: Thu, 18 Jun 2020 15:04:44 -0700

> From: Tao Ren <[email protected]>
>
> 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 <[email protected]>

Applied.