| From | Greg Kroah-Hartman <> | Subject | [PATCH 5.18 083/339] scsi: sd: Dont call blk_cleanup_disk() in sd_probe() | Date | Mon, 13 Jun 2022 12:08:28 +0200 |
| |
From: Christoph Hellwig <hch@lst.de>
[ Upstream commit 7274ce0558adb4b9b1f5c5b613fb4fe331c18911 ]
In SCSI the midlayer has ownership of the request_queue, so on probe failure we must only put the gendisk, but leave the request_queue alone.
Link: https://lore.kernel.org/r/20220523083813.227935-1-hch@lst.de Fixes: 03252259e18e ("scsi: sd: Clean up gendisk if device_add_disk() failed") Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index dc6e55761fd1..5539d75dcfe7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3475,7 +3475,7 @@ static int sd_probe(struct device *dev) error = device_add_disk(dev, gd, NULL); if (error) { put_device(&sdkp->disk_dev); - blk_cleanup_disk(gd); + put_disk(gd); goto out; } -- 2.35.1
|