From patchwork Mon Oct 27 21:46:28 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Ditto X-Patchwork-Id: 5976 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C78D7DDF16 for ; Tue, 28 Oct 2008 08:46:57 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from tidalnetworks.net (mail.consentry.com [75.35.230.10]) by ozlabs.org (Postfix) with ESMTP id 93471DDDE7 for ; Tue, 28 Oct 2008 08:46:32 +1100 (EST) Received: from swdev19.tidalnetworks.net ([172.16.1.134]) by tidalnetworks.net over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 27 Oct 2008 14:46:28 -0700 Message-ID: <490636B4.2010202@consentry.com> Date: Mon, 27 Oct 2008 14:46:28 -0700 From: Mike Ditto User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: netdev@vger.kernel.org, linuxppc-dev@ozlabs.org Subject: Re: [PATCH v2] powerpc/fs_enet: Add missing irq free in error path. References: <49027044.90509@consentry.com> <1D4ED273-13FB-4D2F-82B1-89D2F6F0B9A1@kernel.crashing.org> In-Reply-To: <1D4ED273-13FB-4D2F-82B1-89D2F6F0B9A1@kernel.crashing.org> X-OriginalArrivalTime: 27 Oct 2008 21:46:28.0291 (UTC) FILETIME=[7773B930:01C9387D] X-TM-AS-Product-Ver: SMEX-7.5.0.1243-5.5.1027-16244.002 X-TM-AS-Result: No--11.816800-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 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@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org If something goes wrong attaching to phy driver, we weren't freeing the IRQ. Signed-off-by: Mike Ditto --- Reposting to CC netdev list. (Thanks, Kumar) diff -r -upN 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c NEW/drivers/net/fs_enet/fs_enet-main.c --- 2.6.28-rc1/drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:54:31.000000000 -0700 +++ NEW/drivers/net/fs_enet/fs_enet-main.c 2008-10-24 17:57:03.000000000 -0700 @@ -795,6 +795,7 @@ static int fs_enet_open(struct net_devic err = fs_init_phy(dev); if (err) { + free_irq(fep->interrupt, dev); if (fep->fpi->use_napi) napi_disable(&fep->napi); return err;