From: Roel Kluin <roel.kluin@gmail.com>
Date: Thu, 17 Dec 2009 14:45:15 +0000 (+0000)
Subject: powerpc/85xx: Wrong variable returned on error
X-Git-Tag: upstream/snapshot3+hdmi~16031^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29827b02dc5d1eed8a1ff8b34cd1926966a87e89;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

powerpc/85xx: Wrong variable returned on error

The wrong variable was returned in the case of an error.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

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);