From 89690906da9bea5034c301442fa738cd761e9c2c Mon Sep 17 00:00:00 2001 From: Greg Dietsche Date: Thu, 16 Jun 2011 07:04:30 +0000 Subject: [PATCH] --- yaml --- r: 255587 b: refs/heads/master c: 0a3f084179731f6755462aa7fec677f8e1f0580a h: refs/heads/master i: 255585: 5210eeb2e3696020436760b944a88e7638a4b35b 255583: 1f4a29d4e191b6d7b134fa15d46a18e24cf20a0e v: v3 --- [refs] | 2 +- trunk/drivers/net/phy/icplus.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 70962a6282fe..f49e73303136 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb0a60564943db21ed3af975ac3d578cdc80b329 +refs/heads/master: 0a3f084179731f6755462aa7fec677f8e1f0580a diff --git a/trunk/drivers/net/phy/icplus.c b/trunk/drivers/net/phy/icplus.c index 9a09e24c30bc..d4cbc2922b23 100644 --- a/trunk/drivers/net/phy/icplus.c +++ b/trunk/drivers/net/phy/icplus.c @@ -109,11 +109,7 @@ static int ip1001_config_init(struct phy_device *phydev) value = phy_read(phydev, 16); value |= 0x3; - err = phy_write(phydev, 16, value); - if (err < 0) - return err; - - return err; + return phy_write(phydev, 16, value); } static int ip175c_read_status(struct phy_device *phydev)