diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 07:00:50 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-04 07:00:50 +0900 |
| commit | bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2 (patch) | |
| tree | 53763eef4382a42cad216edf0247108b621e45b1 /sound | |
| parent | 55db4c64eddf37e31279ec15fe90314713bc9cfa (diff) | |
| download | kernel_goldelico_gta04-bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2.zip kernel_goldelico_gta04-bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2.tar.gz kernel_goldelico_gta04-bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2.tar.bz2 | |
Revert "ASoC: Update cx20442 for TTY API change"
This reverts commit ed0bd2333cffc3d856db9beb829543c1dfc00982.
Since we reverted the TTY API change, we should revert the ASoC update
to it too.
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cx20442.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index f8c663d..d68ea53 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 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() */ |