diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2021-05-08 11:22:39 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-20 16:21:14 +0200 |
| commit | 558fe7c3c6ddb21dd7d74c0dad07b37129b6edeb (patch) | |
| tree | 081339946d8e1076e3d8bd102c18d8000f9d51af | |
| parent | 57fc30d192bca623746d9cbe0f4eb8b197abdfb7 (diff) | |
| download | linux-stable-558fe7c3c6ddb21dd7d74c0dad07b37129b6edeb.tar.gz linux-stable-558fe7c3c6ddb21dd7d74c0dad07b37129b6edeb.tar.bz2 linux-stable-558fe7c3c6ddb21dd7d74c0dad07b37129b6edeb.zip | |
um: fix error return code in winch_tramp()
[ Upstream commit ccf1236ecac476d9d2704866d9a476c86e387971 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/um/drivers/chan_user.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c index 3fd7c3efdb18..feb7f5ab4084 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; |