diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-10-16 01:30:20 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-10-19 04:51:34 +0200 |
| commit | 2a7a891f4c406822801ecd676b076c64de072c9e (patch) | |
| tree | 2b60fc8e73ec572ece283aa027cc567a6c7b13ec | |
| parent | scsi: target: Perform ALUA group changes in one step (diff) | |
| download | linux-2a7a891f4c406822801ecd676b076c64de072c9e.tar.xz linux-2a7a891f4c406822801ecd676b076c64de072c9e.zip | |
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: Christoph Hellwig <hch@lst.de>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/sd.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 8b19d7cb5e96..1ba83a892976 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -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); |