1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index f9a52af7f5b4..5143c8990845 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -885,7 +885,11 @@ static int __init init_sr(void)
         rc = register_blkdev(SCSI_CDROM_MAJOR, "sr");
         if (rc)
                 return rc;
-        return scsi_register_driver(&sr_template.gendrv);
+        rc = scsi_register_driver(&sr_template.gendrv);
+        if (rc)
+                unregister_blkdev(SCSI_CDROM_MAJOR, "sr");
+
+        return rc;
 }
 
 static void __exit exit_sr(void)