From a851d88d3612fbb455d0a079df5c2e2f79ec05aa Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Sun, 26 May 2013 21:31:28 +0000 Subject: [PATCH] --- yaml --- r: 376627 b: refs/heads/master c: 9a9c56cb34e65000d1f0a4b7553399bfcf7c5a52 h: refs/heads/master i: 376625: 873aa73d5eba55e2153c711e5b6eb5afa470ef3b 376623: c51075055562ff6f892926febc8b2f8a5ccc5ee1 v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/phy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c0b87229e2c8..4b77e45f0123 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a622260254ee481747cceaaa8609985b29a31565 +refs/heads/master: 9a9c56cb34e65000d1f0a4b7553399bfcf7c5a52 diff --git a/trunk/drivers/net/phy/phy.c b/trunk/drivers/net/phy/phy.c index c14f14741b3f..38f0b312ff85 100644 --- a/trunk/drivers/net/phy/phy.c +++ b/trunk/drivers/net/phy/phy.c @@ -1044,7 +1044,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv); lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp); idx = phy_find_setting(phydev->speed, phydev->duplex); - if ((lp & adv & settings[idx].setting)) + if (!(lp & adv & settings[idx].setting)) goto eee_exit; if (clk_stop_enable) {