From 0f2432266483c21c2949ef066636f382fc510434 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 24 Aug 2007 02:28:42 +0200
Subject: [PATCH] --- yaml --- r: 64353 b: refs/heads/master c:
 abcb1ff326bfe74f3611d7de653276540ea060dd h: refs/heads/master i:   64351:
 ff109e1b53c1048d150006827bad7710bd40b835 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/char/tty_io.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9a6753cac450..3235e34933ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87bd1e9aaf067050bd88b3219b1582e8f67f7b87
+refs/heads/master: abcb1ff326bfe74f3611d7de653276540ea060dd
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 51ea93cab6c4..9c867cf6de64 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -2063,8 +2063,7 @@ static int init_dev(struct tty_driver *driver, int idx,
 	}
 
 	if (!*tp_loc) {
-		tp = (struct ktermios *) kmalloc(sizeof(struct ktermios),
-						GFP_KERNEL);
+		tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
 		if (!tp)
 			goto free_mem_out;
 		*tp = driver->init_termios;
@@ -2094,8 +2093,7 @@ static int init_dev(struct tty_driver *driver, int idx,
 		}
 
 		if (!*o_tp_loc) {
-			o_tp = (struct ktermios *)
-				kmalloc(sizeof(struct ktermios), GFP_KERNEL);
+			o_tp = kmalloc(sizeof(struct ktermios), GFP_KERNEL);
 			if (!o_tp)
 				goto free_mem_out;
 			*o_tp = driver->other->init_termios;