From patchwork Fri Oct 24 23:10:18 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Ditto X-Patchwork-Id: 5735 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 E3F7DDE636 for ; Sat, 25 Oct 2008 10:12:24 +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 8D4CF474DA for ; Sat, 25 Oct 2008 10:10:27 +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); Fri, 24 Oct 2008 16:10:29 -0700 Message-ID: <490255DA.40104@consentry.com> Date: Fri, 24 Oct 2008 16:10:18 -0700 From: Mike Ditto User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: linuxppc-dev@ozlabs.org Subject: [PATCH] powerpc: Add missing irq free in fs_enet error path. X-OriginalArrivalTime: 24 Oct 2008 23:10:29.0086 (UTC) FILETIME=[B4C2BFE0:01C9362D] X-TM-AS-Product-Ver: SMEX-7.5.0.1243-5.5.1027-16238.002 X-TM-AS-Result: No--3.955500-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 --- cvs diff -r linux-2_6_27 -upN linux/drivers/net/fs_enet/fs_enet-main.c Index: linux/drivers/net/fs_enet/fs_enet-main.c =================================================================== retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 fs_enet-main.c --- linux/drivers/net/fs_enet/fs_enet-main.c 11 Oct 2008 02:53:59 -0000 1.1.1.1 +++ linux/drivers/net/fs_enet/fs_enet-main.c 24 Oct 2008 22:19:47 -0000 @@ -811,6 +811,7 @@ static int fs_enet_open(struct net_devic err = fs_init_phy(dev); if (err) { + fs_free_irq(dev, fep->interrupt); if (fep->fpi->use_napi) napi_disable(&fep->napi); return err;