From patchwork Tue Apr 17 02:08:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Schmitz X-Patchwork-Id: 899017 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CoqqJfgI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Q7vc22kzz9s15 for ; Tue, 17 Apr 2018 12:08:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752813AbeDQCIZ (ORCPT ); Mon, 16 Apr 2018 22:08:25 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:39995 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751172AbeDQCIX (ORCPT ); Mon, 16 Apr 2018 22:08:23 -0400 Received: by mail-pl0-f66.google.com with SMTP id t22-v6so2475218plo.7; Mon, 16 Apr 2018 19:08:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=M6HoN87Zp/Vb5Pw9NyVa+bnK0qcP24TtclcJvxspRT0=; b=CoqqJfgI6NEpa++9NwOwDx6UM7wBC0mg7JmJapYii5IpzY203N8vQXyVB6P1vhpLdP 73SR6LnG1CBP1ij4sRb65sod+cORss1IycCzF1dmw0pZJYome4sDrIkVATq+BBk/fPOc UOkB6GZvf6tNQroCwt8gX4YOggGJhGtHgR5KynyLpTv079R6Gj8N8hZcZdlUj2bC0rEs GucWATXqWk9+F+CmPAvE6sVA2SHXLBKYZ83mJx3rHvx7sPW3cYkZu4fEbnSpr98Ljv7p iA1ftePuBADFsmJKz8rTUhsO5vGNKF9EtLQXQX6sgpRZAQsTHqP8kv+/69o27iLPwXOg tGTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M6HoN87Zp/Vb5Pw9NyVa+bnK0qcP24TtclcJvxspRT0=; b=ibuxUnvpR5DbAALlVjIkzo5MlC6EMWicSefXlAc9lQpIRO/NmoS5WynVEreDqlL9TP judFw/BZm5hXlquAiQOzrkPMcPYsbLeH2LAVkcZnWccY6pzmGqU9r5vpKynCTOZf+waf RD3xnK3cqUj/k4cyl4SfLj9BH7CHGdC2Nz79FZR23y/60Uw+IhU8sGdOUsvDH06NWc5a 24G305E8fzdtzm1A9YI7nJgntzjVS10/9BjnFCzbMud7wWROxxkB0QQylEVcL8kasmKM wInpIA4WWch94A6dNmTlpJgj7kmvHtEJM1nz8x/jI72WPqeodHmPvdZn2bSFizzTtaK1 +PSg== X-Gm-Message-State: ALQs6tCYQvkzH+xNdbS7c3XMjlD2VkW0L39at77IMeEge7ixRqbZIB09 ao1sG9SVVcgY63OhMg9wPAw= X-Google-Smtp-Source: AIpwx48fgHrx8/luxcz+wD6LYDQ33diF6EOOGOfbHSMA+psrekm1bbgrZdbozrV6Vd7vRH/2pQCfBg== X-Received: by 2002:a17:902:b7c7:: with SMTP id v7-v6mr227051plz.190.1523930902994; Mon, 16 Apr 2018 19:08:22 -0700 (PDT) Received: from xplor.waratah.dyndns.org (222-154-41-72-adsl.bb.spark.co.nz. [222.154.41.72]) by smtp.gmail.com with ESMTPSA id z127sm23983761pfb.72.2018.04.16.19.08.21 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 16 Apr 2018 19:08:21 -0700 (PDT) Received: by xplor.waratah.dyndns.org (Postfix, from userid 1000) id 56E14360082; Tue, 17 Apr 2018 14:08:18 +1200 (NZST) From: Michael Schmitz To: netdev@vger.kernel.org Cc: andrew@lunn.ch, linux-m68k@vger.kernel.org, Michael.Karcher@fu-berlin.de, John Paul Adrian Glaubitz , Michael Karcher Subject: [PATCH v2 3/8] net: ax88796: Do not free IRQ in ax_remove() (already freed in ax_close()). Date: Tue, 17 Apr 2018 14:08:10 +1200 Message-Id: <1523930895-6973-4-git-send-email-schmitzmic@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> References: <1523916285-6057-1-git-send-email-schmitzmic@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: John Paul Adrian Glaubitz This complements the fix in 82533ad9a1c that removed the free_irq call in the error path of probe, to also not call free_irq when remove is called to revert the effects of probe. Signed-off-by: Michael Karcher Reviewed-by: Geert Uytterhoeven --- drivers/net/ethernet/8390/ax88796.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index 83e59ae..ecf104c 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -793,7 +793,6 @@ static int ax_remove(struct platform_device *pdev) struct resource *mem; unregister_netdev(dev); - free_irq(dev->irq, dev); iounmap(ei_local->mem); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);