From 90c8d0a9e48932012d2877740a2c0164d788b037 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 2 Apr 2012 13:54:14 +0200 Subject: [PATCH] --- yaml --- r: 304143 b: refs/heads/master c: b538c4eaf29176da55804963fb6a77883be6400a h: refs/heads/master i: 304141: 44f03ed07f80100f12aac066c71644cf204fed6e 304139: 60ce512eac66e57af4d07ad0636ccf07c106acaa 304135: fe41e953bf5ea7bca04e0ab332e02dfb11b53d21 304127: 50942c5596af96b4a64e1f523832cf4dddc2cdd8 v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/sclp_vt220.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 00a55ae438f1..fb9822fddcd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 092f73779906899c687c5db58d2603c9619c7763 +refs/heads/master: b538c4eaf29176da55804963fb6a77883be6400a diff --git a/trunk/drivers/s390/char/sclp_vt220.c b/trunk/drivers/s390/char/sclp_vt220.c index 25cf2e8c162a..edfc0fd73dc6 100644 --- a/trunk/drivers/s390/char/sclp_vt220.c +++ b/trunk/drivers/s390/char/sclp_vt220.c @@ -34,7 +34,6 @@ #define SCLP_VT220_DEVICE_NAME "ttysclp" #define SCLP_VT220_CONSOLE_NAME "ttyS" #define SCLP_VT220_CONSOLE_INDEX 1 /* console=ttyS1 */ -#define SCLP_VT220_BUF_SIZE 80 /* Representation of a single write request */ struct sclp_vt220_request { @@ -496,9 +495,6 @@ sclp_vt220_open(struct tty_struct *tty, struct file *filp) { if (tty->count == 1) { tty_port_tty_set(&sclp_vt220_port, tty); - tty->driver_data = kmalloc(SCLP_VT220_BUF_SIZE, GFP_KERNEL); - if (tty->driver_data == NULL) - return -ENOMEM; tty->low_latency = 0; if (!tty->winsize.ws_row && !tty->winsize.ws_col) { tty->winsize.ws_row = 24; @@ -514,11 +510,8 @@ sclp_vt220_open(struct tty_struct *tty, struct file *filp) static void sclp_vt220_close(struct tty_struct *tty, struct file *filp) { - if (tty->count == 1) { + if (tty->count == 1) tty_port_tty_set(&sclp_vt220_port, NULL); - kfree(tty->driver_data); - tty->driver_data = NULL; - } } /*