From e6f590cae3c9fe533f743011ee4e4e0de65b1b71 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 11 May 2011 16:05:44 +0200 Subject: [PATCH] --- yaml --- r: 248679 b: refs/heads/master c: ed0bd2333cffc3d856db9beb829543c1dfc00982 h: refs/heads/master i: 248677: 032ce75e6ae6053610b24b2f8aec8d40b07d2b5d 248675: 37a456cdad95c676bb1608c28eb56d10da824f88 248671: bf75804837ce64a3367e2d50f656630b079e435e v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/cx20442.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b42e8d1fb0e8..4d5de3257716 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 177c2cbf7dc4f6599efa6cd2b514381784f47634 +refs/heads/master: ed0bd2333cffc3d856db9beb829543c1dfc00982 diff --git a/trunk/sound/soc/codecs/cx20442.c b/trunk/sound/soc/codecs/cx20442.c index 0bb424af956f..64f863d51ac8 100644 --- a/trunk/sound/soc/codecs/cx20442.c +++ b/trunk/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() */