From patchwork Sat Oct 25 01:03:00 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Ditto X-Patchwork-Id: 5752 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 32570DDE00 for ; Sat, 25 Oct 2008 12:03:16 +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 75112DDD04 for ; Sat, 25 Oct 2008 12:03:01 +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 18:02:53 -0700 Message-ID: <49027044.90509@consentry.com> Date: Fri, 24 Oct 2008 18:03:00 -0700 From: Mike Ditto User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: linuxppc-dev@ozlabs.org Subject: [PATCH v2] powerpc: Add missing irq free in fs_enet error path. X-OriginalArrivalTime: 25 Oct 2008 01:02:53.0068 (UTC) FILETIME=[687CBCC0:01C9363D] X-TM-AS-Product-Ver: SMEX-7.5.0.1243-5.5.1027-16238.003 X-TM-AS-Result: No--5.337200-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 --- I just noticed this file has already been touched in -rc1 so here is the patch again, adjusted accordingly. 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;