From ec4d00fa1d18408a7c9ee77eabe70de8527d5209 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Sun, 6 May 2007 14:49:33 -0700 Subject: [PATCH] --- yaml --- r: 54197 b: refs/heads/master c: 543691a6cd70b606dd9bed5e77b120c5d9c5c506 h: refs/heads/master i: 54195: 7e38b155a7b5b15f35c66d75186d6de5e5729842 v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_io.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 79640e884090..5afd973a2616 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5637e65ee2cecd344b1f8ff750013f697d3ae16 +refs/heads/master: 543691a6cd70b606dd9bed5e77b120c5d9c5c506 diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index 7a32df594907..389da364e6b6 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/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) {