diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-05-23 10:38:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 18:44:53 +0200 |
| commit | 0a9cd23d2993ac107940ecde63694dcf9f19dc7f (patch) | |
| tree | 8f20a311fed2420c0953aea78ec15b4bb4c527e3 | |
| parent | 27efaafff23c7280cb3a96df7098f98864813d32 (diff) | |
scsi: sd: Don't call blk_cleanup_disk() in sd_probe()
[ 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>
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index dc6e55761fd1f..5539d75dcfe79 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; } |