summaryrefslogtreecommitdiff
path: root/sound/soc/ti
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-10-23 21:38:22 +0300
committerMark Brown <broonie@kernel.org>2023-10-23 21:38:22 +0300
commit4fc4db7a68c2c04522880c4f89317f7874a4188f (patch)
treedc7e38eb44e2e4eb177245c157869ff301287590 /sound/soc/ti
parent61f85372d293241f4139731c14cab9ac8e9436fb (diff)
parent05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff)
downloadlinux-4fc4db7a68c2c04522880c4f89317f7874a4188f.tar.xz
ASoC: Merge up v6.6-rc7
Get fixes needed so we can enable build of ams-delta in more configurations.
Diffstat (limited to 'sound/soc/ti')
-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 687c1d969285..9c2cd993763a 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;