summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2021-05-08 11:22:39 +0800
committerRichard Weinberger <richard@nod.at>2021-06-17 22:10:56 +0200
commitccf1236ecac476d9d2704866d9a476c86e387971 (patch)
tree536f7bbf74f1b2d2680f2e2a5e0e688800a33ae5 /arch/um
parentb77e81fbe5f5fb4ad9a61ec80f6d1e30b6da093a (diff)
downloadlinux-ccf1236ecac476d9d2704866d9a476c86e387971.tar.gz
linux-ccf1236ecac476d9d2704866d9a476c86e387971.tar.bz2
linux-ccf1236ecac476d9d2704866d9a476c86e387971.zip
um: fix error return code in winch_tramp()
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/chan_user.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index d8845d4aac6a..6040817c036f 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -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;