diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-06 12:04:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-06 12:04:26 +0300 |
| commit | a681e6559ce6fe8ca56333f7041d0a0d38aaee94 (patch) | |
| tree | 8f369aaa68139cf75a444ac404bae12e52c4ea80 /arch/um/drivers | |
| parent | 53c2f13c1ee59c8889bf23ef58653677e3ec1644 (diff) | |
| parent | 7b59ab988c01c190f1b528cf750d6f33b738d1e2 (diff) | |
| download | linux-a681e6559ce6fe8ca56333f7041d0a0d38aaee94.tar.xz | |
Merge v6.15.5
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/ubd_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index c5e6545f6fcf..8e8a8bf518b6 100644 --- a/arch/um/drivers/ubd_user.c +++ b/arch/um/drivers/ubd_user.c @@ -41,7 +41,7 @@ int start_io_thread(struct os_helper_thread **td_out, int *fd_out) *fd_out = fds[1]; err = os_set_fd_block(*fd_out, 0); - err = os_set_fd_block(kernel_fd, 0); + err |= os_set_fd_block(kernel_fd, 0); if (err) { printk("start_io_thread - failed to set nonblocking I/O.\n"); goto out_close; |