diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7c8bfb26c99554cf327b4deabc9213fd7ce3773d..5385805e06a829ad8176420ab44d36e18c0fcf77 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3498,7 +3498,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_safe(dev, gd, NULL);
+	if (error) {
+		device_unregister(&sdkp->dev);
+		goto out;
+	}
+
 	blk_delete_region(disk_devt(sdkp->disk), SD_MINORS, sd_default_probe);
 	if (sdkp->security) {
 		sdkp->opal_dev = init_opal_dev(sdkp, &sd_sec_submit);