[PATCH] scsi: vmw_pvscsi: Fix an error handling path in pvscsi_probe()

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
To: Vishal Bhakta <vbhakta@vmware.com>,
	VMware PV-Drivers Reviewers <pv-drivers@vmware.com>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Cathy Avery <cavery@redhat.com>,
	"Ewan D. Milne" <emilne@redhat.com>
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
	Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
	Zheyu Ma <zheyuma97@gmail.com>,
	linux-scsi@vger.kernel.org
Subject: [PATCH] scsi: vmw_pvscsi: Fix an error handling path in pvscsi_probe()
Date: Sun,  9 Oct 2022 08:31:24 +0200	[thread overview]
Message-ID: <ed31652626b0d8133e90f6888ef2b56cbc46ee57.1665297058.git.christophe.jaillet@wanadoo.fr> (raw)

In all paths that end to "out_release_resources_and_disable", neither
pci_alloc_irq_vectors() nor request_irq() have been called yet. So, there
is no point in calling pvscsi_shutdown_intr() which undoes these calls.

Remove this erroneous call.

This should fix the bug report in [1].

[1]: https://lore.kernel.org/all/CAMhUBjnDdk7_bBzqgFhZ=xf-obJYMbsJf10wC_bsUeTzxXLK6A@mail.gmail.com/

Reported-by: Zheyu Ma <zheyuma97@gmail.com>
Fixes: 02f425f811ce ("scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
The Fixes: tag is maybe not optimal, the issue was there even before.
But I think that this commit reference should help in case of backport
(and it makes git-mail add Dan automagically in copy :) )
---
 drivers/scsi/vmw_pvscsi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index f88ecdb93a8a..1c8a72520e5b 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -1555,7 +1555,6 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	return error;
 
 out_release_resources_and_disable:
-	pvscsi_shutdown_intr(adapter);
 	pvscsi_release_resources(adapter);
 	goto out_disable_device;
 }
-- 
2.34.1

