diff options
| author |   Srinivas Kandagatla <srinivas.kandagatla@st.com> | 2012-04-02 00:02:09 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-03 18:48:58 -0400 |
| commit | b3300146aa8efc5d3937fd33f3cfdc580a3843bc (patch) | |
| tree | 89d0f63b53d8412bec93f4da8c5edf2ea4066dda /drivers/net/phy | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net (diff) | |
| download | linux-dev-b3300146aa8efc5d3937fd33f3cfdc580a3843bc.tar.xz linux-dev-b3300146aa8efc5d3937fd33f3cfdc580a3843bc.zip | |
phy:icplus:fix Auto Power Saving in ip101a_config_init.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/icplus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index 0856e1b7a849..f08c85acf761 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -162,7 +162,8 @@ static int ip101a_g_config_init(struct phy_device *phydev) /* Enable Auto Power Saving mode */ c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); c |= IP101A_G_APS_ON; - return c; + + return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); } static int ip175c_read_status(struct phy_device *phydev) |