aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-11 10:05:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-11 18:11:21 -0400
commited0bd2333cffc3d856db9beb829543c1dfc00982 (patch)
treee83e740acfc4fd040e458d8a1877d4b5f3191194 /sound
parent177c2cbf7dc4f6599efa6cd2b514381784f47634 (diff)
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.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 0bb424af956f..64f863d51ac8 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)
274} 274}
275 275
276/* Line discipline .receive_buf() */ 276/* Line discipline .receive_buf() */
277static void v253_receive(struct tty_struct *tty, 277static unsigned int v253_receive(struct tty_struct *tty,
278 const unsigned char *cp, char *fp, int count) 278 const unsigned char *cp, char *fp, int count)
279{ 279{
280 struct snd_soc_codec *codec = tty->disc_data; 280 struct snd_soc_codec *codec = tty->disc_data;
281 struct cx20442_priv *cx20442; 281 struct cx20442_priv *cx20442;
282 282
283 if (!codec) 283 if (!codec)
284 return; 284 return count;
285 285
286 cx20442 = snd_soc_codec_get_drvdata(codec); 286 cx20442 = snd_soc_codec_get_drvdata(codec);
287 287
@@ -293,6 +293,8 @@ static void v253_receive(struct tty_struct *tty,
293 codec->hw_write = (hw_write_t)tty->ops->write; 293 codec->hw_write = (hw_write_t)tty->ops->write;
294 codec->card->pop_time = 1; 294 codec->card->pop_time = 1;
295 } 295 }
296
297 return count;
296} 298}
297 299
298/* Line discipline .write_wakeup() */ 300/* Line discipline .write_wakeup() */