]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
s390/3270: fix return value check in tty3270_resize_work()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 10 Sep 2013 22:49:20 +0000 (06:49 +0800)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 30 Sep 2013 11:04:38 +0000 (13:04 +0200)
In case of error, the function tty3270_alloc_screen() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/tty3270.c

index a0f47c83fd62f94205a987a728edf207f86c3bc6..3f4ca4e09a4ccc4d49fba39d64094fafe1f1fdc7 100644 (file)
@@ -810,7 +810,7 @@ static void tty3270_resize_work(struct work_struct *work)
        struct winsize ws;
 
        screen = tty3270_alloc_screen(tp->n_rows, tp->n_cols);
-       if (!screen)
+       if (IS_ERR(screen))
                return;
        /* Switch to new output size */
        spin_lock_bh(&tp->view.lock);