1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 997f8e30509b..f9c1192dc15e 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -60,6 +60,10 @@
 #include "sr.h"
 
 
+MODULE_DESCRIPTION("SCSI cdrom (sr) driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_BLOCKDEV_MAJOR(SCSI_CDROM_MAJOR);
+
 #define SR_DISKS        256
 
 #define MAX_RETRIES     3
@@ -525,10 +529,9 @@ static int sr_probe(struct device *dev)
                 goto fail;
 
         error = -ENOMEM;
-        cd = kmalloc(sizeof(*cd), GFP_KERNEL);
+        cd = kzalloc(sizeof(*cd), GFP_KERNEL);
         if (!cd)
                 goto fail;
-        memset(cd, 0, sizeof(*cd));
 
         kref_init(&cd->kref);
 
@@ -574,8 +577,6 @@ static int sr_probe(struct device *dev)
         get_capabilities(cd);
         sr_vendor_init(cd);
 
-        snprintf(disk->devfs_name, sizeof(disk->devfs_name),
-                        "%s/cd", sdev->devfs_name);
         disk->driverfs_dev = &sdev->sdev_gendev;
         set_capacity(disk, cd->capacity);
         disk->private_data = &cd->driver;