X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fchar%2Ftty_io.c;h=9c867cf6de6456293314eb1675e697c87a9f64d2;hb=038a5008b2f395c85e6e71d6ddf3c684e7c405b0;hp=51ea93cab6c4c098cbd40dba6d17aa96e09b5c6e;hpb=e4f3b1e74b67fdcdd3034b84997fad7912f182f6;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 51ea93cab6c..9c867cf6de6 100644
--- a/drivers/char/tty_io.c
+++ b/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;