Commit 0296bea0 authored by Li Nan's avatar Li Nan Committed by Martin K. Petersen
Browse files

scsi: sd: Unregister device if device_add_disk() failed in sd_probe() 



"if device_add() succeeds, you should call device_del() when you want to
get rid of it."

In sd_probe(), device_add_disk() fails when device_add() has already
succeeded, so change put_device() to device_unregister() to ensure device
resources are released.

Fixes: 2a7a891f ("scsi: sd: Add error handling support for add_disk()")
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Link: https://lore.kernel.org/r/20231208082335.1754205-1-linan666@huaweicloud.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6bc5e70b

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -3920,7 +3920,7 @@ static int sd_probe(struct device *dev) 


	error = device_add_disk(dev, gd, NULL);

	if (error) {

		put_device(&sdkp->disk_dev);

		device_unregister(&sdkp->disk_dev);

		put_disk(gd);

		goto out;

	}