summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-10-15 18:11:39 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2023-10-15 18:11:39 +0200
commit41226a360d8f51c13935bbc2ac8925c0fe8d41f7 (patch)
tree67196b7244e81e240f0e154acfda46c82e3d957e /sound
parentMerge tag 'char-misc-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentASoC: ti: ams-delta: Fix cx81801_receive() argument types (diff)
downloadlinux-41226a360d8f51c13935bbc2ac8925c0fe8d41f7.tar.xz
linux-41226a360d8f51c13935bbc2ac8925c0fe8d41f7.zip
Merge tag 'tty-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH: "Here are some small tty/serial driver fixes for 6.6-rc6 that resolve some reported issues. Included in here are: - serial core pm runtime fix for issue reported by many - 8250_omap driver fix - rs485 spinlock fix for reported problem - ams-delta bugfix for previous tty api changes in -rc1 that missed this driver that never seems to get built in any test systems All of these have been in linux-next for over a week with no reported problems" * tag 'tty-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: ASoC: ti: ams-delta: Fix cx81801_receive() argument types serial: core: Fix checks for tx runtime PM state serial: 8250_omap: Fix errors with no_console_suspend serial: Reduce spinlocked portion of uart_rs485_config()
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ti/ams-delta.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/ti/ams-delta.c b/sound/soc/ti/ams-delta.c
index 371943350fdf..666057d50ea0 100644
--- a/sound/soc/ti/ams-delta.c
+++ b/sound/soc/ti/ams-delta.c
@@ -336,8 +336,8 @@ static void cx81801_hangup(struct tty_struct *tty)
}
/* Line discipline .receive_buf() */
-static void cx81801_receive(struct tty_struct *tty, const u8 *cp,
- const char *fp, int count)
+static void cx81801_receive(struct tty_struct *tty, const u8 *cp, const u8 *fp,
+ size_t count)
{
struct snd_soc_component *component = tty->disc_data;
const unsigned char *c;