um: fix error return code in winch_tramp()
authorZhen Lei <thunder.leizhen@huawei.com>
Sat, 8 May 2021 03:22:39 +0000 (11:22 +0800)
committerRichard Weinberger <richard@nod.at>
Thu, 17 Jun 2021 20:10:56 +0000 (22:10 +0200)
Fix to return a negative error code from the error handling case instead
of 0, as done elsewhere in this function.

Fixes: 89df6bfc0405 ("uml: DEBUG_SHIRQ fixes")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-By: anton.ivanov@cambridgegreys.com
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/drivers/chan_user.c

index d8845d4..6040817 100644 (file)
@@ -256,7 +256,8 @@ static int winch_tramp(int fd, struct tty_port *port, int *fd_out,
                goto out_close;
        }
 
-       if (os_set_fd_block(*fd_out, 0)) {
+       err = os_set_fd_block(*fd_out, 0);
+       if (err) {
                printk(UM_KERN_ERR "winch_tramp: failed to set thread_fd "
                       "non-blocking.\n");
                goto out_close;