Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3337404imu; Sun, 11 Nov 2018 12:40:52 -0800 (PST) X-Google-Smtp-Source: AJdET5cpv+HcJ6bCPNNPJP4xfffWcz4SkrDE3XiDGW/ixxtBmsnzhKJQ2obuWd5/QeH50NS903Eh X-Received: by 2002:a17:902:3143:: with SMTP id w61-v6mr13728875plb.58.1541968852208; Sun, 11 Nov 2018 12:40:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541968852; cv=none; d=google.com; s=arc-20160816; b=i/rtOT/EQ4DjO7RNpdKCg7U56gmkLF7XXnlUb+iZMOLe3Ny7yJImD+JIzFX2ptL5ZH rOR1K8W9/IvGFPp475Ouun1fIZy5MVxNuSzWhlhB/yMj4pk6cZwHZLoDkL0mNXPe1hSc TssjwSeeV9q01DbdhSIAWMnTKnfsXQ/p4C60JWMVqY3Th7YlXEBakdbhK0A/q7qA1La7 V5q+uQzroASMDb2lfGSATqvZ4+/pc1pVWz5Lv9YxU2jplZrH3h8+EkpPs3U5MH1TN0Hy 4VIVm9MoqRRp4qhujBMhUQkWnckoKAPQ4ryw1jEk3bwhyYliabcRnUNz7NLerowxJWVj Aicw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=WDHmZmMyS7W+DocK2MkDtNUxycw24xtgNBOI3Vw99q8=; b=DR6AdtGrHYUu8MOfcAdyRrwhmsNAq3z4Oa4hPb792mqJpMdXyDv8xzZowe5TNn6LKP M2aecrHxDvBs0bADyoOB0oEoe/qsISLHFd8wDCOqUlVDqrwswUxhu6nnqWE7zLXvwulp cl+2n5n+1lska+b73jZh1cqnuNAFHH6JujFLwr0rbOSoEwCJ5647S82sdSu2gtktymju tAnwzDbgnqMj9bceJZNoGFQc1QL+KQpNZ2GFiZim0QJu7dJx69M1QmR9oTDLq7p1oMt4 TiwlC0WZ6w+9+glNr/PRsVQ4PK5WfVy1mjyYu6UcJsSi9B5SI1AR28zjEJCezh/ng+V0 DPAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d25si5087876pgd.88.2018.11.11.12.40.37; Sun, 11 Nov 2018 12:40:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729968AbeKLFsF (ORCPT + 99 others); Mon, 12 Nov 2018 00:48:05 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:49464 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729906AbeKLFsF (ORCPT ); Mon, 12 Nov 2018 00:48:05 -0500 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gLvsQ-0000l4-Bm; Sun, 11 Nov 2018 19:58:34 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gLvsN-0001Ni-UB; Sun, 11 Nov 2018 19:58:31 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Michael Schmitz" , "Geert Uytterhoeven" , "David S. Miller" , "Michael Karcher" Date: Sun, 11 Nov 2018 19:49:05 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 021/366] net-next: ax88796: Do not free IRQ in ax_remove() (already freed in ax_close()). In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.61-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Michael Karcher commit 9144c3795c2636351d553e4d0fc5297201182de2 upstream. This complements the fix in 82533ad9a1c ("net: ethernet: ax88796: don't call free_irq without request_irq first") 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. Fixes: 82533ad9a1c (net: ethernet: ax88796: don't call free_irq without request_irq first) Signed-off-by: Michael Karcher Signed-off-by: Michael Schmitz Reviewed-by: Geert Uytterhoeven Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings --- drivers/net/ethernet/8390/ax88796.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -812,7 +812,6 @@ static int ax_remove(struct platform_dev struct resource *mem; unregister_netdev(dev); - free_irq(dev->irq, dev); iounmap(ei_local->mem); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);