diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 09:12:16 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 09:12:16 -0600 |
| commit | c226feb013ce81a18512fb4827bf7c2352d8b470 (patch) | |
| tree | 4415ebda1c24f68bd7b88641f64097111eb359e0 /sound/soc/codecs/cx20442.c | |
| parent | 32919a28cc8470b1526f77b2f12cca8841b9ac62 (diff) | |
| parent | 85ec7b970553369e0c956fab1d7a6022f2a99369 (diff) | |
Merge branch 'for_3.0/gpio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/merge
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() */ |