alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@kernel.org, tiwai@suse.com
Cc: vinod.koul@intel.com, alsa-devel@alsa-project.org,
	patches@opensource.wolfsonmicro.com, lgirdwood@gmail.com
Subject: [PATCH 1/4] ASoC: compress: Pass error out of soc_compr_pointer
Date: Thu, 10 Mar 2016 10:44:51 +0000	[thread overview]
Message-ID: <1457606694-10985-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)

The soc_compr_pointer does not correctly pass any errors returned by the
driver callback back up the stack. This patch corrects this issue.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 sound/soc/soc-compress.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 875733c..d2df46c 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -530,14 +530,15 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
 	struct snd_soc_platform *platform = rtd->platform;
+	int ret = 0;
 
 	mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass);
 
 	if (platform->driver->compr_ops && platform->driver->compr_ops->pointer)
-		 platform->driver->compr_ops->pointer(cstream, tstamp);
+		ret = platform->driver->compr_ops->pointer(cstream, tstamp);
 
 	mutex_unlock(&rtd->pcm_mutex);
-	return 0;
+	return ret;
 }
 
 static int soc_compr_copy(struct snd_compr_stream *cstream,
-- 
2.1.4

             reply	other threads:[~2016-03-10 10:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-10 10:44 Charles Keepax [this message]
2016-03-10 10:44 ` [PATCH 2/4] ALSA: compress: Handle errors during avail requests Charles Keepax
2016-03-11  7:54   ` Vinod Koul
2016-03-10 10:44 ` [PATCH 3/4] ASoC: wm_adsp: Factor out checking of stream errors from the DSP Charles Keepax
2016-03-10 10:44 ` [PATCH 4/4] ASoC: wm_adsp: Improve DSP error handling Charles Keepax
2016-03-10 16:41   ` Charles Keepax
2016-03-11  7:48 ` [PATCH 1/4] ASoC: compress: Pass error out of soc_compr_pointer Vinod Koul
2016-03-11 10:04   ` Charles Keepax
2016-03-11 10:25     ` Takashi Iwai
2016-03-11 10:41       ` Vinod Koul
2016-03-11 10:37     ` Vinod Koul
2016-03-11 10:39       ` Takashi Iwai
2016-03-11 11:13         ` Charles Keepax
2016-03-11 11:14         ` Vinod Koul
2016-03-21 13:07           ` Charles Keepax
2016-06-22 15:29 ` Applied "ASoC: compress: Pass error out of soc_compr_pointer" to the asoc tree Mark Brown

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=1457606694-10985-1-git-send-email-ckeepax@opensource.wolfsonmicro.com \
    --to=ckeepax@opensource.wolfsonmicro.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=tiwai@suse.com \
    --cc=vinod.koul@intel.com \
    /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 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).