From 9798deade96f71d79c5b790f1535d31b78148187 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 4 Jun 2011 07:00:50 +0900 Subject: [PATCH] --- yaml --- r: 252975 b: refs/heads/master c: bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2 h: refs/heads/master i: 252973: 23b53d2e247275adc345177b89ddfcef1c40e316 252971: c569f63e3bff6b023b097f8642b4ab50f01025a9 252967: 7f75740a1efd513d72ddc3cc7627f66f15ef5faa 252959: 20b4ef6e72c26750580547571a5145b80ae243d5 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/cx20442.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f9dcff1ea8eb..756a5435d708 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55db4c64eddf37e31279ec15fe90314713bc9cfa +refs/heads/master: bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2 diff --git a/trunk/sound/soc/codecs/cx20442.c b/trunk/sound/soc/codecs/cx20442.c index f8c663dcff02..d68ea532cc7f 100644 --- a/trunk/sound/soc/codecs/cx20442.c +++ b/trunk/sound/soc/codecs/cx20442.c @@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty) } /* Line discipline .receive_buf() */ -static unsigned int v253_receive(struct tty_struct *tty, - const unsigned char *cp, char *fp, int count) +static void 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 count; + return; cx20442 = snd_soc_codec_get_drvdata(codec); @@ -281,8 +281,6 @@ static unsigned int 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() */