diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 09:57:14 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 09:57:14 +0200 |
| commit | 099b4d3b473db012a55ce6bec9ef594d0508e782 (patch) | |
| tree | a55980b995612c188d02bd6f47b93f1e17733572 /sound/soc/codecs/cx20442.c | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes (diff) | |
| parent | davinci: make PCM platform devices static (diff) | |
| download | linux-099b4d3b473db012a55ce6bec9ef594d0508e782.tar.xz linux-099b4d3b473db012a55ce6bec9ef594d0508e782.zip | |
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into fixes
Diffstat (limited to 'sound/soc/codecs/cx20442.c')
| -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 f8c663dcff02..d68ea532cc7f 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() */ |