From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B20DC43387 for ; Thu, 20 Dec 2018 09:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33B4420811 for ; Thu, 20 Dec 2018 09:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545299233; bh=GTLd4AqhPVDAeAZnzFp02DR2sWEZkmHMsZrgZSwtfBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=daXNDZewD3lg/FiVp6s4GpiApiTFSo3OaTb957MRHS01TLEd/axkoT7x4n5HRIpvF PBy819JLG8klAbsQa/X3vUcq7Kftfk/RC8HgMCou3ZxsZwXvHvXk+5oCjeEE1kKh0a In4k/4SHDbSx7MzvHI++daHlGUrzDmj0o+S+rf5A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730310AbeLTJTp (ORCPT ); Thu, 20 Dec 2018 04:19:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:44868 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730273AbeLTJTl (ORCPT ); Thu, 20 Dec 2018 04:19:41 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD79421720; Thu, 20 Dec 2018 09:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1545297580; bh=GTLd4AqhPVDAeAZnzFp02DR2sWEZkmHMsZrgZSwtfBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n9CwYeClSOpDDgoSWrFdAAMt7lOwnR7J+KFmz2CR3FCgIxN9e3q1dkdWtG+mdwyGJ kSUZr4gh0jAjoyskpmRG3GPHjLE8TqWlAi/NMvXO7mFf2z4Vg8MZm86UecjtvmXAbX GNtYOOAyPfdCuRjmReK+GtDH1DkmnTz2JesZ8QUc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cathy Avery , "Ewan D. Milne" , Dan Carpenter , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 3.18 13/31] scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload Date: Thu, 20 Dec 2018 10:18:25 +0100 Message-Id: <20181220085743.129116012@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181220085742.601260254@linuxfoundation.org> References: <20181220085742.601260254@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 02f425f811cefcc4d325d7a72272651e622dc97e ] Currently pvscsi_remove calls free_irq more than once as pvscsi_release_resources and __pvscsi_shutdown both call pvscsi_shutdown_intr. This results in a 'Trying to free already-free IRQ' warning and stack trace. To solve the problem pvscsi_shutdown_intr has been moved out of pvscsi_release_resources. Signed-off-by: Cathy Avery Reviewed-by: Ewan D. Milne Reviewed-by: Dan Carpenter Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/vmw_pvscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index d5dd70049f81..25119780edae 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c @@ -1225,8 +1225,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter) static void pvscsi_release_resources(struct pvscsi_adapter *adapter) { - pvscsi_shutdown_intr(adapter); - if (adapter->workqueue) destroy_workqueue(adapter->workqueue); @@ -1555,6 +1553,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) out_reset_adapter: ll_adapter_reset(adapter); out_release_resources: + pvscsi_shutdown_intr(adapter); pvscsi_release_resources(adapter); scsi_host_put(host); out_disable_device: @@ -1563,6 +1562,7 @@ out_disable_device: return error; out_release_resources_and_disable: + pvscsi_shutdown_intr(adapter); pvscsi_release_resources(adapter); goto out_disable_device; } -- 2.19.1