diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-12-12 14:49:35 +0100 |
commit | 7b26bc6582b13a52a42a4a9765e8f30d58a81198 (patch) | |
tree | 80737d9bb4abf42b8e2061a5edacdfbe5ac9b7d6 /include/linux/io_uring/cmd.h | |
parent | b2e538a9827dd04ab5273bf4be8eb2edb84357b0 (diff) | |
parent | 255cc582e6e16191a20d54bcdbca6c91d3e90c5e (diff) | |
download | linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.gz linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.tar.bz2 linux-7b26bc6582b13a52a42a4a9765e8f30d58a81198.zip |
Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.13
A small pile of driver specific fixes, all quite small and not
particularly major.
Diffstat (limited to 'include/linux/io_uring/cmd.h')
-rw-r--r-- | include/linux/io_uring/cmd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index 578a3fdf5c71..0d5448c0b86c 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -43,7 +43,7 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, * Note: the caller should never hard code @issue_flags and is only allowed * to pass the mask provided by the core io_uring code. */ -void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, ssize_t res2, +void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, u64 res2, unsigned issue_flags); void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd, @@ -67,7 +67,7 @@ static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, return -EOPNOTSUPP; } static inline void io_uring_cmd_done(struct io_uring_cmd *cmd, ssize_t ret, - ssize_t ret2, unsigned issue_flags) + u64 ret2, unsigned issue_flags) { } static inline void __io_uring_cmd_do_in_task(struct io_uring_cmd *ioucmd, |