diff options
| author |   Moritz Fischer <mdf@kernel.org> | 2019-02-06 21:45:29 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-07 09:49:49 -0800 |
| commit | 8f289805616e81f7c1690931aa8a586c76f4fa88 (patch) | |
| tree | 54c3ccccc095440563cb34e9b87c2b02251e574c /drivers/net/phy | |
| parent | net: emac: remove IBM_EMAC_RX_SKB_HEADROOM (diff) | |
| download | linux-dev-8f289805616e81f7c1690931aa8a586c76f4fa88.tar.xz linux-dev-8f289805616e81f7c1690931aa8a586c76f4fa88.zip | |
net: phy: fixed_phy: Fix fixed_phy not checking GPIO
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/fixed_phy.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); |