Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb3d6bf1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

sound/soc/codecs/cx20442.c

+3 −5
Original line number Diff line number Diff line
@@ -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,

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() */