From ff12bcef16abb63d66aa75235c2def3d605e24d3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 8 May 2014 21:52:40 +0000 Subject: kernel: fix some compile warnings with kernel 3.14 Signed-off-by: Hauke Mehrtens SVN-Revision: 40734 --- .../generic/patches-3.14/702-phy_add_aneg_done_function.patch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch') diff --git a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch index 9d6da7b185..d634647ddb 100644 --- a/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-3.14/702-phy_add_aneg_done_function.patch @@ -33,13 +33,17 @@ if (status < 0) --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -99,6 +99,9 @@ static int phy_config_interrupt(struct p +@@ -99,7 +99,12 @@ static int phy_config_interrupt(struct p */ static inline int phy_aneg_done(struct phy_device *phydev) { +- int retval = phy_read(phydev, MII_BMSR); ++ int retval; ++ + if (phydev->drv->aneg_done) + return phydev->drv->aneg_done(phydev); + - int retval = phy_read(phydev, MII_BMSR); ++ retval = phy_read(phydev, MII_BMSR); return (retval < 0) ? retval : (retval & BMSR_ANEGCOMPLETE); + } -- cgit v1.2.3