aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-12-16 22:25:43 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-23 13:21:12 -0500
commit0e214ad81545a35c5e62a4c2d6cf7275fd7a545f (patch)
tree8327c0394729760d43ba7ba1548d9afbfba9670c /drivers/net
parentfdac1e0697356ac212259f2147aa60c72e334861 (diff)
USB: mcs7830: return negative if auto negotiate fails
The original code returns 0 on success and 1 on failure. In fact, at this point, "ret" is already either zero or a negative error code so we can just return it directly. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/usb/mcs7830.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index b701f593cd59..2b791392e788 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -355,7 +355,7 @@ static int mcs7830_set_autoneg(struct usbnet *dev, int ptrUserPhyMode)
355 if (!ret) 355 if (!ret)
356 ret = mcs7830_write_phy(dev, MII_BMCR, 356 ret = mcs7830_write_phy(dev, MII_BMCR,
357 BMCR_ANENABLE | BMCR_ANRESTART ); 357 BMCR_ANENABLE | BMCR_ANRESTART );
358 return ret < 0 ? : 0; 358 return ret;
359} 359}
360 360
361 361