From: Vinod Koul <vinod.koul@intel.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, liam.r.girdwood@linux.intel.com,
patches.audio@intel.com, broonie@kernel.org,
stable@vger.kernel.org
Subject: Re: [alsa-devel] [PATCH] ASoC: compress: Fix compress device direction check
Date: Thu, 7 Jan 2016 21:44:46 +0530 [thread overview]
Message-ID: <20160107161446.GK11778@localhost> (raw)
In-Reply-To: <s5hy4c1heu2.wl-tiwai@suse.de>
On Thu, Jan 07, 2016 at 11:19:17AM +0100, Takashi Iwai wrote:
> On Thu, 07 Jan 2016 09:23:11 +0100,
> Vinod Koul wrote:
> >
> > The detection of direction for compress takes into account codec
> > capabilities only and not the CPU ones. Fix this by checking the
> > CPU side capabilities as well.
> >
> > Cc: <stable@vger.kernel.org>
> > Tested-by: Ashish Panwar <ashish.panwar@intel.com>
> > Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> > ---
> > sound/soc/soc-compress.c | 23 ++++++++++++++++++++---
> > 1 file changed, 20 insertions(+), 3 deletions(-)
> >
> > diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> > index 12a9820feac1..b5737945bcc3 100644
> > --- a/sound/soc/soc-compress.c
> > +++ b/sound/soc/soc-compress.c
> > @@ -630,6 +630,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
> > struct snd_pcm *be_pcm;
> > char new_name[64];
> > int ret = 0, direction = 0;
> > + int playback = 0, capture = 0;
> >
> > if (rtd->num_codecs > 1) {
> > dev_err(rtd->card->dev, "Multicodec not supported for compressed stream\n");
> > @@ -641,11 +642,27 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
> > rtd->dai_link->stream_name, codec_dai->name, num);
> >
> > if (codec_dai->driver->playback.channels_min)
> > + playback = 1;
> > + if (codec_dai->driver->capture.channels_min)
> > + capture = 1;
> > +
> > + capture = capture && cpu_dai->driver->capture.channels_min;
> > + playback = playback && cpu_dai->driver->playback.channels_min;
> > +
> > + /*
> > + * Compress devices are unidirectional so only one of the directions
> > + * should be set, check for that (xor)
> > + */
> > + if (!(playback || capture)) {
>
> I don't think this can catch the case where both playback and capture
> are set. You need really use XOR operator for that. Or, something
> like:
> if (playback + capture != 1) {
Oops, i did mean XOR (see comment) but messed the implementation
and did NOR :(, thanks for pointing, will send updated one..
--
~Vinod
prev parent reply other threads:[~2016-01-07 16:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 8:23 [PATCH] ASoC: compress: Fix compress device direction check Vinod Koul
2016-01-07 8:23 ` Vinod Koul
2016-01-07 10:19 ` [alsa-devel] " Takashi Iwai
2016-01-07 16:14 ` Vinod Koul [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160107161446.GK11778@localhost \
--to=vinod.koul@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=patches.audio@intel.com \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.