Browse Source

ASoC: Update cx20442 for TTY API change

receive_buf() was recently changed to return the number of bytes
received but the cx20442 driver wasn't updated to match the new API.
I don't have any hardware but since we don't actually appears to be
listening to the data at all just report that we accepted all the data
that was offered to us.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mark Brown 14 năm trước cách đây
mục cha
commit
ed0bd2333c
1 tập tin đã thay đổi với 5 bổ sung3 xóa
  1. 5 3
      sound/soc/codecs/cx20442.c

+ 5 - 3
sound/soc/codecs/cx20442.c

@@ -274,14 +274,14 @@ static int v253_hangup(struct tty_struct *tty)
 }
 }
 
 
 /* Line discipline .receive_buf() */
 /* Line discipline .receive_buf() */
-static void v253_receive(struct tty_struct *tty,
-				const unsigned char *cp, char *fp, int count)
+static unsigned int v253_receive(struct tty_struct *tty,
+				 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;
+		return count;
 
 
 	cx20442 = snd_soc_codec_get_drvdata(codec);
 	cx20442 = snd_soc_codec_get_drvdata(codec);
 
 
@@ -293,6 +293,8 @@ static void 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() */