From patchwork Thu Jul 8 12:09:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58244 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 28905B6EEC for ; Thu, 8 Jul 2010 22:10:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756575Ab0GHMKG (ORCPT ); Thu, 8 Jul 2010 08:10:06 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:54488 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756450Ab0GHMKE (ORCPT ); Thu, 8 Jul 2010 08:10:04 -0400 Received: by ewy23 with SMTP id 23so169357ewy.19 for ; Thu, 08 Jul 2010 05:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=upVoAxEfbHHn7AVIXdTNGkNxGAsEwQ1ottVlPJahpLM=; b=FeRtlVQGwXLAhRIkXL7lOEaJkyJPv51Km0nTIfU+rMVJA1X2CIn2oGWmPAAR5HPYKJ Hl93OAlIwtBqUo+3FWvBdC5/yvZ76QgQ4QuE35N6ivnEuJ3ePefDuQuTZNiJpOTa/x+5 Ec+8aUiCiOqR6i+BVXwKXW7naAjvPQJhC21T0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=huNSQuvYVSvw9DsBIQaorSHh+oP9x3zfNc5j4SE6M2aHo/nVX+2C3MntipxFQUCBV/ HPsOp3GobfZohGZMS8nZWuuL34qgMop6OANzn0BMmidbzExIIByWnKfzkl5ASD1yqJdY 0mzyEgIRnbDr5jwWmrowjI/L6P5PuMbBTMyHc= Received: by 10.213.17.7 with SMTP id q7mr5259324eba.23.1278591002650; Thu, 08 Jul 2010 05:10:02 -0700 (PDT) Received: from localhost ([91.78.208.116]) by mx.google.com with ESMTPS id a48sm70737940eei.0.2010.07.08.05.10.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Jul 2010 05:10:01 -0700 (PDT) From: Kulikov Vasiliy To: Kernel Janitors Cc: Paul Gortmaker , "David S. Miller" , Julia Lawall , Tejun Heo , Joe Perches , netdev@vger.kernel.org Subject: [PATCH 1/4] ax88796: free irq on error Date: Thu, 8 Jul 2010 16:09:54 +0400 Message-Id: <1278590996-3122-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If ax_ei_open() failed we must free previously requested irq. Signed-off-by: Kulikov Vasiliy --- drivers/net/ax88796.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 55c9958..20e946b 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c @@ -481,8 +481,10 @@ static int ax_open(struct net_device *dev) return ret; ret = ax_ei_open(dev); - if (ret) + if (ret) { + free_irq(dev->irq, dev); return ret; + } /* turn the phy on (if turned off) */