diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-01-08 15:20:05 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 15:55:01 +0100 |
| commit | 57985d7e1e48f16548aa6904264e21bca15af0fc (patch) | |
| tree | fd6d29f4c5ceacbb6315125f0c121d2da830f0d1 /drivers/s390/char | |
| parent | 736c9fd2902d919b075cf9cf371d1733c5ff635d (diff) | |
| download | op-kernel-dev-57985d7e1e48f16548aa6904264e21bca15af0fc.zip op-kernel-dev-57985d7e1e48f16548aa6904264e21bca15af0fc.tar.gz | |
s390/3270: fix initialization order in tty3270_alloc_view
Corrects the order of tasklet_init vs. the allocation of the
read request which has been broken by git commit 9d2ae233
"TTY: tty3270, move initialization to allocation".
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/tty3270.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 9640184..5e4b6fc 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c @@ -683,12 +683,6 @@ tty3270_alloc_view(void) INIT_LIST_HEAD(&tp->update); INIT_LIST_HEAD(&tp->rcl_lines); tp->rcl_max = 20; - tty_port_init(&tp->port); - setup_timer(&tp->timer, (void (*)(unsigned long)) tty3270_update, - (unsigned long) tp); - tasklet_init(&tp->readlet, - (void (*)(unsigned long)) tty3270_read_tasklet, - (unsigned long) tp->read); for (pages = 0; pages < TTY3270_STRING_PAGES; pages++) { tp->freemem_pages[pages] = (void *) @@ -710,6 +704,14 @@ tty3270_alloc_view(void) tp->kbd = kbd_alloc(); if (!tp->kbd) goto out_reset; + + tty_port_init(&tp->port); + setup_timer(&tp->timer, (void (*)(unsigned long)) tty3270_update, + (unsigned long) tp); + tasklet_init(&tp->readlet, + (void (*)(unsigned long)) tty3270_read_tasklet, + (unsigned long) tp->read); + return tp; out_reset: |
