Commit bb3d6bf1 authored by Linus Torvalds's avatar Linus Torvalds

Revert "ASoC: Update cx20442 for TTY API change"

This reverts commit ed0bd233.

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55db4c64
...@@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty) ...@@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty)
} }
/* Line discipline .receive_buf() */ /* Line discipline .receive_buf() */
static unsigned int v253_receive(struct tty_struct *tty, static void v253_receive(struct tty_struct *tty,
const unsigned char *cp, char *fp, int count) const unsigned char *cp, char *fp, int count)
{ {
struct snd_soc_codec *codec = tty->disc_data; struct snd_soc_codec *codec = tty->disc_data;
struct cx20442_priv *cx20442; struct cx20442_priv *cx20442;
if (!codec) if (!codec)
return count; return;
cx20442 = snd_soc_codec_get_drvdata(codec); cx20442 = snd_soc_codec_get_drvdata(codec);
...@@ -281,8 +281,6 @@ static unsigned int v253_receive(struct tty_struct *tty, ...@@ -281,8 +281,6 @@ static unsigned int v253_receive(struct tty_struct *tty,
codec->hw_write = (hw_write_t)tty->ops->write; codec->hw_write = (hw_write_t)tty->ops->write;
codec->card->pop_time = 1; codec->card->pop_time = 1;
} }
return count;
} }
/* Line discipline .write_wakeup() */ /* Line discipline .write_wakeup() */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment