linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / s390 / char / monreader.c

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index a138b15..5fd3ad8 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -257,13 +257,14 @@ mon_alloc_mem(void)
        int i,j;
        struct mon_private *monpriv;
 
-       monpriv = kzalloc(sizeof(struct mon_private), GFP_KERNEL);
+       monpriv = kmalloc(sizeof(struct mon_private), GFP_KERNEL);
        if (!monpriv) {
                P_ERROR("no memory for monpriv\n");
                return NULL;
        }
+       memset(monpriv, 0, sizeof(struct mon_private));
        for (i = 0; i < MON_MSGLIM; i++) {
-               monpriv->msg_array[i] = kzalloc(sizeof(struct mon_msg),
+               monpriv->msg_array[i] = kmalloc(sizeof(struct mon_msg),
                                                    GFP_KERNEL);
                if (!monpriv->msg_array[i]) {
                        P_ERROR("open, no memory for msg_array\n");
@@ -271,6 +272,7 @@ mon_alloc_mem(void)
                                kfree(monpriv->msg_array[j]);
                        return NULL;
                }
+               memset(monpriv->msg_array[i], 0, sizeof(struct mon_msg));
        }
        return monpriv;
 }
@@ -586,6 +588,7 @@ static struct file_operations mon_fops = {
 
 static struct miscdevice mon_dev = {
        .name       = "monreader",
+       .devfs_name = "monreader",
        .fops       = &mon_fops,
        .minor      = MISC_DYNAMIC_MINOR,
 };