Return-Path: Message-Id: <20130813155826.472406244@goodmis.org> Date: Tue, 13 Aug 2013 11:57:12 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Giuseppe Cavallaro , "David S. Miller" Subject: [18/88] net: phy: fix a bug when verify the EEE support References: <20130813155654.069291373@goodmis.org> Content-Disposition: inline; filename=0018-net-phy-fix-a-bug-when-verify-the-EEE-support.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.7-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Giuseppe CAVALLARO [ Upstream commit 9a9c56cb34e65000d1f0a4b7553399bfcf7c5a52 ] The phy_init_eee has to exit with an error when the local device and its link partner both do not support EEE. So this patch fixes a problem when verify this. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller Signed-off-by: Steven Rostedt --- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 7ca2ff9..ec95660 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -1152,7 +1152,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) adv = phy_eee_to_adv(eee_adv); lp = phy_eee_to_adv(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) { -- 1.7.10.4