From patchwork Fri Jul 9 12:31:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 58399 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 77BFEB6F0E for ; Fri, 9 Jul 2010 22:32:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756003Ab0GIMb4 (ORCPT ); Fri, 9 Jul 2010 08:31:56 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:61480 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755733Ab0GIMby (ORCPT ); Fri, 9 Jul 2010 08:31:54 -0400 Received: by eya25 with SMTP id 25so288859eya.19 for ; Fri, 09 Jul 2010 05:31:53 -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=lyX60ZdNfYvboPEsAFoh4N3qIaxjSYitZyG+orPKrcI=; b=MpO1NOT2y3kTfqomJuMk6sygyQbQVUs5510xvPUqlyT/OHo5wsC9MF3yEnC6YhzQhn cCJmd4eA1KkuXXhFVH4j2JLflzPYMPZ7jzADD+9FQ1+OYV0pzrMuxN2lK048Z665k+Gt hjiRL1hvAq8J7PkahU0475LrhELXrevfREfhE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=W1dZPC5W79bftF53dhZoxTehSndym4XwebydQH5Fem3lwd7ZSlbjEWCAqQF1xPR2A3 /vCxiq9pWLg4P2wlccJbJib4BUeBa5McCqahfRESUZaelRDR69YD460yU9uoyTDq4CpF xSvNRn182x2LzAjZBTOiabG1GXY+k1Id3eY3o= Received: by 10.213.32.136 with SMTP id c8mr8390908ebd.38.1278678713394; Fri, 09 Jul 2010 05:31:53 -0700 (PDT) Received: from localhost ([213.87.80.19]) by mx.google.com with ESMTPS id v8sm7197952eeh.8.2010.07.09.05.31.40 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Jul 2010 05:31:50 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: "David S. Miller" , Jiri Pirko , Joe Perches , Stephen Hemminger , Eric Dumazet , netdev@vger.kernel.org Subject: [PATCH] at1700: fix double free_irq Date: Fri, 9 Jul 2010 16:31:26 +0400 Message-Id: <1278678686-7215-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 free_irq() is called both in net_close() and cleanup_card(). Since it is requested in at1700_probe1(), leave free_irq() only in cleanup_card() for balance. Signed-off-by: Kulikov Vasiliy --- drivers/net/at1700.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 93185f5..8987689 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c @@ -811,10 +811,8 @@ static int net_close(struct net_device *dev) /* No statistic counters on the chip to update. */ /* Disable the IRQ on boards of fmv18x where it is feasible. */ - if (lp->jumpered) { + if (lp->jumpered) outb(0x00, ioaddr + IOCONFIG1); - free_irq(dev->irq, dev); - } /* Power-down the chip. Green, green, green! */ outb(0x00, ioaddr + CONFIG_1);