Skip to content

Commit

Permalink
Revert "ASoC: Update cx20442 for TTY API change"
Browse files Browse the repository at this point in the history
This reverts commit ed0bd23.

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>
  • Loading branch information
torvalds committed Jun 3, 2011
1 parent 55db4c6 commit bb3d6bf
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions sound/soc/codecs/cx20442.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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() */
Expand Down

0 comments on commit bb3d6bf

Please sign in to comment.