Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / s390 / cio / blacklist.c

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 76058a5..08c6603 100644 (file)
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -335,10 +335,9 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
                return -EINVAL;
        if (user_len > 65536)
                user_len = 65536;
-       buf = vmalloc (user_len + 1); /* maybe better use the stack? */
+       buf = vzalloc(user_len + 1); /* maybe better use the stack? */
        if (buf == NULL)
                return -ENOMEM;
-       memset(buf, 0, user_len + 1);
 
        if (strncpy_from_user (buf, user_buf, user_len) < 0) {
                rc = -EFAULT;