2 files changed, 10 insertions, 9 deletions

diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index b89420e6d704..a0b580c22d80 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -1085,7 +1085,7 @@ static int __init mcdx_init_drive(int drive)
 
         xtrace(INIT, "kmalloc space for stuffpt's\n");
         xtrace(MALLOC, "init() malloc %d bytes\n", size);
-        if (!(stuffp = kmalloc(size, GFP_KERNEL))) {
+        if (!(stuffp = kzalloc(size, GFP_KERNEL))) {
                 xwarn("init() malloc failed\n");
                 return 1;
         }
@@ -1101,8 +1101,6 @@ static int __init mcdx_init_drive(int drive)
                sizeof(*stuffp), stuffp);
 
         /* set default values */
-        memset(stuffp, 0, sizeof(*stuffp));
-
         stuffp->present = 0;    /* this should be 0 already */
         stuffp->toc = NULL;     /* this should be NULL already */
 
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 0829db58462f..b5191780ecca 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -46,9 +46,9 @@
 
 #include <asm/vio.h>
 #include <asm/scatterlist.h>
-#include <asm/iSeries/HvTypes.h>
-#include <asm/iSeries/HvLpEvent.h>
-#include <asm/iSeries/vio.h>
+#include <asm/iseries/hv_types.h>
+#include <asm/iseries/hv_lp_event.h>
+#include <asm/iseries/vio.h>
 
 #define VIOCD_DEVICE                    "iseries/vcd"
 #define VIOCD_DEVICE_DEVFS              "iseries/vcd"
@@ -736,13 +736,16 @@ static struct vio_device_id viocd_device_table[] __devinitdata = {
         { "viocd", "" },
         { "", "" }
 };
-
 MODULE_DEVICE_TABLE(vio, viocd_device_table);
+
 static struct vio_driver viocd_driver = {
-        .name = "viocd",
         .id_table = viocd_device_table,
         .probe = viocd_probe,
-        .remove = viocd_remove
+        .remove = viocd_remove,
+        .driver = {
+                .name = "viocd",
+                .owner = THIS_MODULE,
+        }
 };
 
 static int __init viocd_init(void)