* [PATCH] ASoC: Update cx20442 for TTY API change
@ 2011-05-11 7:40 Mark Brown
2011-05-11 8:45 ` Felipe Balbi
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mark Brown @ 2011-05-11 7:40 UTC (permalink / raw)
To: Janusz Krzysztofik, Liam Girdwood
Cc: alsa-devel, patches, Felipe Balbi, Mark Brown
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>
---
sound/soc/codecs/cx20442.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index d68ea53..f8c663d 100644
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty)
}
/* 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 cx20442_priv *cx20442;
if (!codec)
- return;
+ return count;
cx20442 = snd_soc_codec_get_drvdata(codec);
@@ -281,6 +281,8 @@ static void 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() */
--
1.7.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Update cx20442 for TTY API change
2011-05-11 7:40 [PATCH] ASoC: Update cx20442 for TTY API change Mark Brown
@ 2011-05-11 8:45 ` Felipe Balbi
2011-05-11 13:33 ` Liam Girdwood
2011-05-12 0:01 ` Janusz Krzysztofik
2 siblings, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2011-05-11 8:45 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Liam Girdwood, patches, Felipe Balbi,
Janusz Krzysztofik
Hi,
On Wed, May 11, 2011 at 09:40:43AM +0200, Mark Brown wrote:
> 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>
FWIW:
Looks good to me
--
balbi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Update cx20442 for TTY API change
2011-05-11 7:40 [PATCH] ASoC: Update cx20442 for TTY API change Mark Brown
2011-05-11 8:45 ` Felipe Balbi
@ 2011-05-11 13:33 ` Liam Girdwood
2011-05-12 0:01 ` Janusz Krzysztofik
2 siblings, 0 replies; 4+ messages in thread
From: Liam Girdwood @ 2011-05-11 13:33 UTC (permalink / raw)
To: Mark Brown; +Cc: Felipe, alsa-devel, patches, Balbi, Janusz Krzysztofik
On Wed, 2011-05-11 at 09:40 +0200, Mark Brown wrote:
> 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>
> ---
> sound/soc/codecs/cx20442.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
> index d68ea53..f8c663d 100644
> --- a/sound/soc/codecs/cx20442.c
> +++ b/sound/soc/codecs/cx20442.c
> @@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty)
> }
>
> /* 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 cx20442_priv *cx20442;
>
> if (!codec)
> - return;
> + return count;
>
> cx20442 = snd_soc_codec_get_drvdata(codec);
>
> @@ -281,6 +281,8 @@ static void 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() */
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: Update cx20442 for TTY API change
2011-05-11 7:40 [PATCH] ASoC: Update cx20442 for TTY API change Mark Brown
2011-05-11 8:45 ` Felipe Balbi
2011-05-11 13:33 ` Liam Girdwood
@ 2011-05-12 0:01 ` Janusz Krzysztofik
2 siblings, 0 replies; 4+ messages in thread
From: Janusz Krzysztofik @ 2011-05-12 0:01 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, patches, Felipe Balbi, Liam Girdwood
On Wed 11 May 2011 at 09:40:43 Mark Brown wrote:
> 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: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
> ---
> sound/soc/codecs/cx20442.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
> index d68ea53..f8c663d 100644
> --- a/sound/soc/codecs/cx20442.c
> +++ b/sound/soc/codecs/cx20442.c
> @@ -262,14 +262,14 @@ static int v253_hangup(struct tty_struct *tty)
> }
>
> /* 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 cx20442_priv *cx20442;
>
> if (!codec)
> - return;
> + return count;
>
> cx20442 = snd_soc_codec_get_drvdata(codec);
>
> @@ -281,6 +281,8 @@ static void 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() */
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-12 0:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-11 7:40 [PATCH] ASoC: Update cx20442 for TTY API change Mark Brown
2011-05-11 8:45 ` Felipe Balbi
2011-05-11 13:33 ` Liam Girdwood
2011-05-12 0:01 ` Janusz Krzysztofik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).