From patchwork Wed May 26 17:29:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Linn X-Patchwork-Id: 53654 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 4FD15B7FD8 for ; Thu, 27 May 2010 03:47:37 +1000 (EST) Received: by ozlabs.org (Postfix) id D4664B7D27; Thu, 27 May 2010 03:47:27 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 1068 seconds by postgrey-1.32 at bilbo; Thu, 27 May 2010 03:47:27 EST Received: from mail181-va3-R.bigfish.com (mail-va3.bigfish.com [216.32.180.114]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.bigfish.com", Issuer "Microsoft Secure Server Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 657EFB7D24 for ; Thu, 27 May 2010 03:47:27 +1000 (EST) Received: from mail181-va3 (localhost.localdomain [127.0.0.1]) by mail181-va3-R.bigfish.com (Postfix) with ESMTP id D0BA4B78F42; Wed, 26 May 2010 17:29:35 +0000 (UTC) X-SpamScore: 0 X-BigFish: VPS0(zzab9bhzz1202hzzz2dh61h) X-Spam-TCS-SCL: 0:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 149.199.60.83; Service: EHS Received: from mail181-va3 (localhost.localdomain [127.0.0.1]) by mail181-va3 (MessageSwitch) id 1274894975531503_30606; Wed, 26 May 2010 17:29:35 +0000 (UTC) Received: from VA3EHSMHS016.bigfish.com (unknown [10.7.14.248]) by mail181-va3.bigfish.com (Postfix) with ESMTP id 2AA531890052; Wed, 26 May 2010 17:29:35 +0000 (UTC) Received: from xsj-gw1 (149.199.60.83) by VA3EHSMHS016.bigfish.com (10.7.99.26) with Microsoft SMTP Server id 14.0.482.44; Wed, 26 May 2010 17:29:32 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-smtp1.xilinx.com) by xsj-gw1 with esmtp (Exim 4.63) (envelope-from ) id 1OHKQ7-0001NG-To; Wed, 26 May 2010 10:29:31 -0700 From: John Linn To: netdev@vger.kernel.org, linuxppc-dev@ozlabs.org, grant.likely@secretlab.ca, jwboyer@linux.vnet.ibm.com Subject: [PATCH 1/2] net: ll_temac: fix interrupt bug when interrupt 0 is used Date: Wed, 26 May 2010 11:29:18 -0600 X-Mailer: git-send-email 1.5.6.6 X-RCIS-Action: ALLOW MIME-Version: 1.0 Message-ID: <6f264a7a-e5da-494a-a24d-1578ca422807@VA3EHSMHS016.ehs.local> X-Reverse-DNS: unknown-60-83.xilinx.com Cc: michal.simek@petalogix.com, John Linn , john.williams@petalogix.com, Brian Hill X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The code is not checking the interrupt for DMA correctly so that an interrupt number of 0 will cause a false error. Signed-off-by: Brian Hill Signed-off-by: John Linn --- drivers/net/ll_temac_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index fa7620e..0615737 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c @@ -950,7 +950,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match) lp->rx_irq = irq_of_parse_and_map(np, 0); lp->tx_irq = irq_of_parse_and_map(np, 1); - if (!lp->rx_irq || !lp->tx_irq) { + if ((lp->rx_irq == NO_IRQ) || (lp->tx_irq == NO_IRQ)) { dev_err(&op->dev, "could not determine irqs\n"); rc = -ENOMEM; goto nodev;