alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Vinod Koul <vinod.koul@intel.com>
To: alsa-devel@alsa-project.org, tiwai@suse.de
Cc: Vinod Koul <vinod.koul@intel.com>,
	broonie@kernel.org, lgirdwood@gmail.com
Subject: [PATCH 6/9] ALSA: compress: dont write when stream is paused
Date: Tue, 27 Aug 2013 12:10:36 +0530	[thread overview]
Message-ID: <1377585639-29516-7-git-send-email-vinod.koul@intel.com> (raw)
In-Reply-To: <1377585639-29516-1-git-send-email-vinod.koul@intel.com>

and return bytes written as 0 and not error

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---
 sound/core/compress_offload.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index 417a456..fb570c8 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -256,7 +256,7 @@ static ssize_t snd_compr_write(struct file *f, const char __user *buf,
 	struct snd_compr_file *data = f->private_data;
 	struct snd_compr_stream *stream;
 	size_t avail;
-	int retval;
+	int retval = 0;
 
 	if (snd_BUG_ON(!data))
 		return -EFAULT;
@@ -264,6 +264,14 @@ static ssize_t snd_compr_write(struct file *f, const char __user *buf,
 	stream = &data->stream;
 	mutex_lock(&stream->device->lock);
 	/* write is allowed when stream is running or has been steup */
+	 /*
+	  * if the stream is in paused state, return the
+	  * number of bytes consumed as 0
+	  */
+	if (stream->runtime->state == SNDRV_PCM_STATE_PAUSED) {
+		mutex_unlock(&stream->device->lock);
+		return retval;
+	}
 	if (stream->runtime->state != SNDRV_PCM_STATE_SETUP &&
 			stream->runtime->state != SNDRV_PCM_STATE_RUNNING) {
 		mutex_unlock(&stream->device->lock);
-- 
1.7.0.4

  parent reply	other threads:[~2013-08-27  7:25 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-27  6:40 [PATCH 0/9] ALSA: compress offfload fixes Vinod Koul
2013-08-27  6:40 ` [PATCH 1/9] ALSA: Compress - dont use lock for all ioctls Vinod Koul
2013-08-27 10:22   ` Takashi Iwai
2013-08-27  9:44     ` Vinod Koul
2013-08-27 11:00       ` Takashi Iwai
2013-08-27  6:40 ` [PATCH 2/9] ALSA: compress: use mutex in drain Vinod Koul
2013-08-27 10:25   ` Takashi Iwai
2013-08-27  9:47     ` Vinod Koul
2013-08-27 10:53       ` Takashi Iwai
2013-08-27 10:16         ` Vinod Koul
2013-08-27 12:23           ` Takashi Iwai
2013-08-27 13:09             ` Vinod Koul
2013-08-27 14:03               ` Takashi Iwai
2013-08-27 14:10                 ` Vinod Koul
2013-08-27  6:40 ` [PATCH 3/9] ASoC: compress: dont aquire lock for draining states Vinod Koul
2013-08-27  6:40 ` [PATCH 4/9] ALSA: compress: use snprint instread of sprintf Vinod Koul
2013-08-27  6:40 ` [PATCH 5/9] ALSA: compres: wakeup the poll thread on pause Vinod Koul
2013-08-27  6:40 ` Vinod Koul [this message]
2013-08-27  6:40 ` [PATCH 7/9] ALSA: compress: allow write when stream is setup Vinod Koul
2013-08-27  6:40 ` [PATCH 8/9] ALSA: compress: call pointer callback and updates under a lock Vinod Koul
2013-08-27 10:31   ` Takashi Iwai
2013-08-27  9:48     ` Vinod Koul
2013-08-27 11:03       ` Takashi Iwai
2013-08-27  6:40 ` [PATCH 9/9] ALSA: compress: use rate values for passing sampling rates Vinod Koul
2013-08-27 10:30   ` Takashi Iwai
2013-08-27 13:29   ` Mark Brown
2013-08-27 13:26     ` Vinod Koul
2013-08-27 14:27       ` Mark Brown
2013-08-27 10:46 ` [PATCH 0/9] ALSA: compress offfload fixes Takashi Iwai
2013-08-27 10:09   ` Vinod Koul
2013-08-27 12:32     ` Takashi Iwai
2013-08-27 13:14       ` Vinod Koul
2013-08-27 14:05         ` Takashi Iwai
2013-08-27 13:30           ` Vinod Koul
2013-08-27 14:22             ` Takashi Iwai
2013-08-27 13:41               ` Vinod Koul
2013-08-27 14:41                 ` Takashi Iwai
2013-08-27 14:11                   ` Vinod Koul
2013-08-27 13:28       ` Mark Brown
2013-08-27 13:18         ` Vinod Koul

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=1377585639-29516-7-git-send-email-vinod.koul@intel.com \
    --to=vinod.koul@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --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 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).