From 8cdd87ed25d6a7ead7ea9aae4824ab3061c3f419 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 17 Dec 2010 03:25:43 +0000
Subject: [PATCH] --- yaml --- r: 223651 b: refs/heads/master c:
 0e214ad81545a35c5e62a4c2d6cf7275fd7a545f h: refs/heads/master i:   223649:
 3b9116eaffe30de2e4e9378a8c984d08ef405fb9   223647:
 8baf895b352df86ad24bfc61896a2852d2cf4580 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/usb/mcs7830.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a165c6b984fe..2e79c0f4af30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdac1e0697356ac212259f2147aa60c72e334861
+refs/heads/master: 0e214ad81545a35c5e62a4c2d6cf7275fd7a545f
diff --git a/trunk/drivers/net/usb/mcs7830.c b/trunk/drivers/net/usb/mcs7830.c
index b701f593cd59..2b791392e788 100644
--- a/trunk/drivers/net/usb/mcs7830.c
+++ b/trunk/drivers/net/usb/mcs7830.c
@@ -355,7 +355,7 @@ static int mcs7830_set_autoneg(struct usbnet *dev, int ptrUserPhyMode)
 	if (!ret)
 		ret = mcs7830_write_phy(dev, MII_BMCR,
 				BMCR_ANENABLE | BMCR_ANRESTART	);
-	return ret < 0 ? : 0;
+	return ret;
 }