From patchwork Fri Dec 17 13:25:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 75895 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 730FB1007D3 for ; Sat, 18 Dec 2010 00:26:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754786Ab0LQN0K (ORCPT ); Fri, 17 Dec 2010 08:26:10 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:46695 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754656Ab0LQN0J (ORCPT ); Fri, 17 Dec 2010 08:26:09 -0500 Received: by wyb28 with SMTP id 28so609035wyb.19 for ; Fri, 17 Dec 2010 05:26:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=b1ChJvFFAAuoLkJi5vMTGD1OzhllGnBOVaFt2bHfteA=; b=WB77SMfoW3qfoGkteWtfZgEXXldMCop0M295NyMjUFBa5om1kWLSgQJXjd3PcqXto7 yhzXqPXXoOlNYqevmpPbgqnmdOVTGVb/OeQgOMnGTw2V8J/dk0c1RdeQwyH93u0ML8bD SAGwiB0DCseApT0LnFC9wpDklx8HsOXJ8FGaw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=SrMoc8LnYBuvZEvAyrZo9iqOsVKylnpjhShtcVmv4lM4Og4cIvuiund5N0lfEd1fDm IYebUP9SBQ9YclUKJIGy2Zak1NoB1KQdSe0OQ7gwCu+dCUD9AaKNoQtvnq7S/o+Da8lV +Ua5V/S6TcinQKKMd6dCw9cbo5cxhoq9ojfGQ= Received: by 10.216.208.230 with SMTP id q80mr3676851weo.103.1292592367451; Fri, 17 Dec 2010 05:26:07 -0800 (PST) Received: from bicker (h14ba.n2.ips.mtn.co.ug [212.88.116.186]) by mx.google.com with ESMTPS id j58sm182204wes.45.2010.12.17.05.25.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Dec 2010 05:26:06 -0800 (PST) Date: Fri, 17 Dec 2010 16:25:43 +0300 From: Dan Carpenter To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] USB: mcs7830: return negative if auto negotiate fails Message-ID: <20101217132542.GL1639@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 --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; }