On Wed 11 May 2011 at 09:40:43 Mark Brown wrote:

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: Janusz Krzysztofik jkrzyszt@tis.icnet.pl

---

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 d68ea53..f8c663d 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c @@ -262,14 +262,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);

@@ -281,6 +281,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() */