From 2000232d95858347162f443b6d8b6abf6db60a95 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 17 Dec 2009 14:45:15 +0000 Subject: [PATCH] --- yaml --- r: 178163 b: refs/heads/master c: 29827b02dc5d1eed8a1ff8b34cd1926966a87e89 h: refs/heads/master i: 178161: 94f028ae79c82034407397efb66f3361705577e2 178159: 6c43524a1a6f130c202aa8d9d981696a24d15e1e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c3a15889a08..b459be739064 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c916a295f27dbc0df4769a53b109666506bd061 +refs/heads/master: 29827b02dc5d1eed8a1ff8b34cd1926966a87e89 diff --git a/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c index c5028a2e5a58..21f61b8c445b 100644 --- a/trunk/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/trunk/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);