diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 59718903e1efd6e34cf4801a38aa63f7a841ec43..b9cff27e2c810bed2958731fd349de1d0fefe581 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -793,7 +793,7 @@ static int sr_probe(struct device *dev)
 	cd->cdi.disk = disk;
 
 	if (register_cdrom(&cd->cdi))
-		goto fail_put;
+		goto fail_minor;
 
 	/*
 	 * Initialize block layer runtime PM stuffs before the
@@ -811,6 +811,10 @@ static int sr_probe(struct device *dev)
 
 	return 0;
 
+fail_minor:
+	spin_lock(&sr_index_lock);
+	clear_bit(minor, sr_index_bits);
+	spin_unlock(&sr_index_lock);
 fail_put:
 	put_disk(disk);
 	mutex_destroy(&cd->lock);