diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-11 16:05:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 15:11:21 -0700 |
| commit | ed0bd2333cffc3d856db9beb829543c1dfc00982 (patch) | |
| tree | e83e740acfc4fd040e458d8a1877d4b5f3191194 /sound | |
| parent | 177c2cbf7dc4f6599efa6cd2b514381784f47634 (diff) | |
| download | linux-3.10-ed0bd2333cffc3d856db9beb829543c1dfc00982.tar.gz linux-3.10-ed0bd2333cffc3d856db9beb829543c1dfc00982.tar.bz2 linux-3.10-ed0bd2333cffc3d856db9beb829543c1dfc00982.zip | |
ASoC: Update cx20442 for TTY API change
receive_buf() was recently changed to return the number of bytes
received but the cx20442 driver wasn't updated to match the new API.
I don't have any hardware but since we don't actually appears to be
listening to the data at all just report that we accepted all the data
that was offered to us.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cx20442.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index 0bb424af956..64f863d51ac 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c @@ -274,14 +274,14 @@ static int v253_hangup(struct tty_struct *tty) } /* Line discipline .receive_buf() */ -static void v253_receive(struct tty_struct *tty, - const unsigned char *cp, char *fp, int count) +static unsigned int v253_receive(struct tty_struct *tty, + const unsigned char *cp, char *fp, int count) { struct snd_soc_codec *codec = tty->disc_data; struct cx20442_priv *cx20442; if (!codec) - return; + return count; cx20442 = snd_soc_codec_get_drvdata(codec); @@ -293,6 +293,8 @@ static void v253_receive(struct tty_struct *tty, codec->hw_write = (hw_write_t)tty->ops->write; codec->card->pop_time = 1; } + + return count; } /* Line discipline .write_wakeup() */ |