Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57985d7e authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 736c9fd2

drivers/s390/char/tty3270.c

+8 −6
Original line number Diff line number Diff line
@@ -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: