diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-26 03:02:33 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-26 03:02:33 +0300 |
commit | 5c66cfe0780d02af6c1c64fdb655a85921855bee (patch) | |
tree | ffedce71dac53a1526ed0abca5a67a90a7317269 /drivers/net/phy/fixed_phy.c | |
parent | c2943f14534bdc4230f4da6dcd4ea03c5d8c8162 (diff) | |
parent | 691c9a8fdcbbb27682f151a23e36df35fc250c03 (diff) | |
download | linux-5c66cfe0780d02af6c1c64fdb655a85921855bee.tar.xz |
Merge branch 'phy_dsa'
Florian Fainelli says:
====================
net: phy and dsa random fixes/cleanups
These two patches were already present as part of my attempt to make
DSA modules work properly, these are the only two "valid" patches at
this point which should not need any further rework.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/fixed_phy.c')
-rw-r--r-- | drivers/net/phy/fixed_phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index 3ad0e6e16c39..a08a3c78ba97 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -168,7 +168,7 @@ int fixed_phy_set_link_update(struct phy_device *phydev, struct fixed_mdio_bus *fmb = &platform_fmb; struct fixed_phy *fp; - if (!link_update || !phydev || !phydev->bus) + if (!phydev || !phydev->bus) return -EINVAL; list_for_each_entry(fp, &fmb->phys, node) { |