diff mbox

USB: mcs7830: return negative if auto negotiate fails

Message ID 20101217132542.GL1639@bicker
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Dan Carpenter Dec. 17, 2010, 1:25 p.m. UTC
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>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Dec. 23, 2010, 6:22 p.m. UTC | #1
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 17 Dec 2010 16:25:43 +0300

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

Indeed, the USBNET ->bind() method, which this return value propagates
to, expects negative return values on error.

Applied, and queued up for -stable, thanks Dan.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c
index a6281e3..f3fe8e1 100644
--- a/drivers/net/usb/mcs7830.c
+++ b/drivers/net/usb/mcs7830.c
@@ -351,7 +351,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;
 }