| Message ID | 20190207054529.2865-1-mdf@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2,net-next] net: phy: fixed_phy: Fix fixed_phy not checking GPIO | expand |
From: Moritz Fischer <mdf@kernel.org> Date: Wed, 6 Feb 2019 21:45:29 -0800 > Fix fixed_phy not checking GPIO if no link_update callback > is registered. > > In the original version all users registered a link_update > callback so the issue was masked. > > Fixes: a5597008dbc2 ("phy: fixed_phy: Add gpio to determine link up/down.") > Reviewed-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Moritz Fischer <mdf@kernel.org> Applied, thank you.
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index f136a23c1a35..d810f914aaa4 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -85,11 +85,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) s = read_seqcount_begin(&fp->seqcount); fp->status.link = !fp->no_carrier; /* Issue callback if user registered it. */ - if (fp->link_update) { + if (fp->link_update) fp->link_update(fp->phydev->attached_dev, &fp->status); - fixed_phy_update(fp); - } + /* Check the GPIO for change in status */ + fixed_phy_update(fp); state = fp->status; } while (read_seqcount_retry(&fp->seqcount, s));
Fix fixed_phy not checking GPIO if no link_update callback is registered. In the original version all users registered a link_update callback so the issue was masked. Fixes: a5597008dbc2 ("phy: fixed_phy: Add gpio to determine link up/down.") Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Moritz Fischer <mdf@kernel.org> --- Changes from v1: - Added Andrew's Reviewed-by: tag - Added Fixes: tag (Thanks for digging, Andrew!) --- drivers/net/phy/fixed_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)