From patchwork Tue Oct 20 18:14:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 36478 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 3035DB7B93 for ; Wed, 21 Oct 2009 05:04:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751268AbZJTSEe (ORCPT ); Tue, 20 Oct 2009 14:04:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751226AbZJTSEe (ORCPT ); Tue, 20 Oct 2009 14:04:34 -0400 Received: from mail-ew0-f207.google.com ([209.85.219.207]:50819 "EHLO mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbZJTSEd (ORCPT ); Tue, 20 Oct 2009 14:04:33 -0400 Received: by ewy3 with SMTP id 3so5100148ewy.17 for ; Tue, 20 Oct 2009 11:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=BAiu8CSkZPlt9AcoqcbIquDnDUkv/x5Vtttv7Tr4ixA=; b=BSTvSfl+52+CavX9yfI16NAv6MGVCM6t0t2Bf/RumI2/eVk7UDp1X07cQDmNZcEpNE qn6/rbMNZfasKEnB9O3A3Gs96LN0omHE1OMhFK8oNX9z/Ny5wte2gAP8W7bm2wjjvJN1 Q5tL3Skl3J2l/WXhYJcRBNQ1OqkJhk83i1MXk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=fzOrTpConl6uE9jceJS/aDzW2kkL4diF6xNnap6EdFaYAHQ6twaMwkVcubLaOOGNKi vtN3owpZGs+88A7oMtLzZOGnidMtrCMzmN8HMK9/KySSIUQ6kGP9oC7ZKAxn4+vfDMlM /lMgm/pCjddHuHJgZ8Ww5xX6zD5nDFi7C8+gM= Received: by 10.211.146.2 with SMTP id y2mr1689514ebn.21.1256061877100; Tue, 20 Oct 2009 11:04:37 -0700 (PDT) Received: from zoinx.mars (vpn-144-229.vpn.uva.nl [146.50.144.229]) by mx.google.com with ESMTPS id 10sm1192668eyd.33.2009.10.20.11.04.35 (version=SSLv3 cipher=RC4-MD5); Tue, 20 Oct 2009 11:04:36 -0700 (PDT) Message-ID: <4ADDFE0C.3020400@gmail.com> Date: Tue, 20 Oct 2009 20:14:36 +0200 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 MIME-Version: 1.0 To: netdev@vger.kernel.org, Andrew Morton , mcuos.com@gmail.com, davem@davemloft.net Subject: [PATCH] net: Fix checks on unsigned in w90p910_ether_probe() Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ether->txirq and ->rxirq are unsigned Signed-off-by: Roel Kluin --- -- 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/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index 25e2627..503c2ce 100644 --- a/drivers/net/arm/w90p910_ether.c +++ b/drivers/net/arm/w90p910_ether.c @@ -981,7 +981,7 @@ static int __devinit w90p910_ether_probe(struct platform_device *pdev) { struct w90p910_ether *ether; struct net_device *dev; - int error; + int error, ret; dev = alloc_etherdev(sizeof(struct w90p910_ether)); if (!dev) @@ -1010,17 +1010,19 @@ static int __devinit w90p910_ether_probe(struct platform_device *pdev) goto failed_free_mem; } - ether->txirq = platform_get_irq(pdev, 0); - if (ether->txirq < 0) { + ret = platform_get_irq(pdev, 0); + ether->txirq = ret; + if (ret < 0) { dev_err(&pdev->dev, "failed to get ether tx irq\n"); - error = -ENXIO; + error = ret; goto failed_free_io; } - ether->rxirq = platform_get_irq(pdev, 1); - if (ether->rxirq < 0) { + ret = platform_get_irq(pdev, 1); + ether->rxirq = ret; + if (ret < 0) { dev_err(&pdev->dev, "failed to get ether rx irq\n"); - error = -ENXIO; + error = ret; goto failed_free_txirq; }