Merge commit 'v2.6.37-rc1' into for-2.6.37

[firefly-linux-kernel-4.4.55.git] / drivers / net / sungem_phy.c

diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 4a4fac630337695793032f0aeb031cbdc6c6162b..d16880d7099b014916a408ac7682b9c748251ca7 100644 (file)
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -88,7 +88,7 @@ static int reset_one_mii_phy(struct mii_phy* phy, int phy_id)
        if ((val & BMCR_ISOLATE) && limit > 0)
                __phy_write(phy, phy_id, MII_BMCR, val & ~BMCR_ISOLATE);
 
-       return (limit <= 0);
+       return limit <= 0;
 }
 
 static int bcm5201_init(struct mii_phy* phy)