diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-24 15:16:02 +0900 |
| commit | f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5 (patch) | |
| tree | e53c9e39b3149221779c10595bc59fa02de4f45f /arch/powerpc/platforms/85xx/mpc85xx_mds.c | |
| parent | 76382b5bdb77c29ab430e1b82ef1c604c8dd113b (diff) | |
| parent | 32b53076c31ce9159740b744d5eb5d9505312add (diff) | |
| download | kernel_samsung_aries-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.zip kernel_samsung_aries-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.gz kernel_samsung_aries-f34548cb735b7a80bbbb0bdd09ad4c2173ba92d5.tar.bz2 | |
Merge branch 'sh/g3-prep' into sh/for-2.6.33
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_mds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index c5028a2..21f61b8 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -86,7 +86,7 @@ static int mpc8568_fixup_125_clock(struct phy_device *phydev) scr = phy_read(phydev, MV88E1111_SCR); if (scr < 0) - return err; + return scr; err = phy_write(phydev, MV88E1111_SCR, scr | 0x0008); |