From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Subject: [PATCH 3/3] xtsonic: free irq if sonic_open() fails Date: Sat, 10 Jul 2010 15:01:44 +0400 Message-ID: <1278759704-7777-1-git-send-email-segooon@gmail.com> Cc: "David S. Miller" , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Tejun Heo , Joe Perches , netdev@vger.kernel.org To: kernel-janitors@vger.kernel.org Return-path: Received: from mail-qy0-f181.google.com ([209.85.216.181]:47364 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754287Ab0GJLCH (ORCPT ); Sat, 10 Jul 2010 07:02:07 -0400 Sender: netdev-owner@vger.kernel.org List-ID: xtsonic_open() doesn't check sonic_open() return code. If it is error we must free requested IRQ. Signed-off-by: Kulikov Vasiliy --- drivers/net/xtsonic.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index fdba9cb..9f12026 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c @@ -93,12 +93,20 @@ static unsigned short known_revisions[] = static int xtsonic_open(struct net_device *dev) { - if (request_irq(dev->irq,sonic_interrupt,IRQF_DISABLED,"sonic",dev)) { + int retval; + + retval = request_irq(dev->irq, sonic_interrupt, IRQF_DISABLED, + "sonic", dev); + if (retval) { printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq); return -EAGAIN; } - return sonic_open(dev); + + retval = sonic_open(dev); + if (retval) + free_irq(dev->irq, dev); + return retval; } static int xtsonic_close(struct net_device *dev) -- 1.7.0.4