Message ID | 20120509072537.GA437@burratino |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
From: Jonathan Nieder <jrnieder@gmail.com> Date: Wed, 9 May 2012 02:25:37 -0500 > Hi Dave, > > David Miller wrote: >> From: Srinivas KANDAGATLA <srinivas.kandagatla@st.com> > >>> This patch fixes Auto Power Saving configuration in ip101a_config_init >>> which was broken as there is no phy register write followed after >>> setting IP101A_APS_ON flag. >>> >>> This patch also fixes the return value of ip101a_config_init. >>> >>> Without this patch ip101a_config_init returns 2 which is not an error >>> accroding to IS_ERR and the mac driver will continue accessing 2 as >>> valid pointer to phy_dev resulting in memory fault. >>> >>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> >> >> Applied and queued up for -stable, thanks. > > I'm guessing 3.2.y needs this, too, since it also includes > v3.2-rc1~129^2~247 ("net/phy: add IC+ IP101A and support APS"). > > Here's a quick backport made by adjusting the context line to > use IP101A_APS_ON instead of IP101A_G_APS_ON. > > Please include it in some later stable update if appropriate. Please submit this directly to the stable list. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index c81f136ae670..b14230016d9b 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -150,7 +150,8 @@ static int ip101a_config_init(struct phy_device *phydev) /* Enable Auto Power Saving mode */ c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); c |= IP101A_APS_ON; - return c; + + return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); } static int ip175c_read_status(struct phy_device *phydev)