Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2

Authored by Linus Torvalds
1 parent 55db4c64ed
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Revert "ASoC: Update cx20442 for TTY API change" 

This reverts commit ed0bd2333cffc3d856db9beb829543c1dfc00982.

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>

Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff

sound/soc/codecs/cx20442.c
Diff comments   View file @ bb3d6bf
... ... @@ -262,14 +262,14 @@
262 262 }
263 263  
264 264 /* Line discipline .receive_buf() */
265   -static unsigned int v253_receive(struct tty_struct *tty,
266   - const unsigned char *cp, char *fp, int count)
  265 +static void v253_receive(struct tty_struct *tty,
  266 + const unsigned char *cp, char *fp, int count)
267 267 {
268 268 struct snd_soc_codec *codec = tty->disc_data;
269 269 struct cx20442_priv *cx20442;
270 270  
271 271 if (!codec)
272   - return count;
  272 + return;
273 273  
274 274 cx20442 = snd_soc_codec_get_drvdata(codec);
275 275  
... ... @@ -281,8 +281,6 @@
281 281 codec->hw_write = (hw_write_t)tty->ops->write;
282 282 codec->card->pop_time = 1;
283 283 }
284   -
285   - return count;
286 284 }
287 285  
288 286 /* Line discipline .write_wakeup() */