Commit 2a7a891f authored by Luis Chamberlain's avatar Luis Chamberlain Committed by Martin K. Petersen
Browse files

scsi: sd: Add error handling support for add_disk() 

We never checked for errors on add_disk() as this function returned
void. Now that this is fixed, use the shiny new error handling.

As with the error handling for device_add() we follow the same logic and
just put the device so that cleanup is done via the scsi_disk_release().

Link: https://lore.kernel.org/r/20211015233028.2167651-2-mcgrof@kernel.org


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f9793d64

drivers/scsi/sd.c

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

			sdp->host->hostt->rpm_autosuspend_delay);

	}

	device_add_disk(dev, gd, NULL);



	error = device_add_disk(dev, gd, NULL);

	if (error) {

		put_device(&sdkp->dev);

		goto out;

	}



	if (sdkp->capacity)

		sd_dif_config_host(sdkp);