Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 7a32df594907..389da364e6b6 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3720,11 +3720,10 @@ int tty_register_driver(struct tty_driver *driver)
         if (driver->flags & TTY_DRIVER_INSTALLED)
                 return 0;
 
-        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM)) {
-                p = kmalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL);
+        if (!(driver->flags & TTY_DRIVER_DEVPTS_MEM) && driver->num) {
+                p = kzalloc(driver->num * 3 * sizeof(void *), GFP_KERNEL);
                 if (!p)
                         return -ENOMEM;
-                memset(p, 0, driver->num * 3 * sizeof(void *));
         }
 
         if (!driver->major) {