From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: tiwai@suse.com
Cc: vinod.koul@intel.com, alsa-devel@alsa-project.org
Subject: [PATCH 2/5] ALSA: compress: Use snd_compr_get_poll on error path
Date: Wed, 4 May 2016 14:59:08 +0100 [thread overview]
Message-ID: <1462370351-15388-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1462370351-15388-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
We have a function that returns the appropriate flags for the stream
direction, so we should use it.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/core/compress_offload.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index a9933c07..5268546 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -421,10 +421,7 @@ static unsigned int snd_compr_poll(struct file *f, poll_table *wait)
retval = snd_compr_get_poll(stream);
break;
default:
- if (stream->direction == SND_COMPRESS_PLAYBACK)
- retval = POLLOUT | POLLWRNORM | POLLERR;
- else
- retval = POLLIN | POLLRDNORM | POLLERR;
+ retval = snd_compr_get_poll(stream) | POLLERR;
break;
}
out:
--
2.1.4
next prev parent reply other threads:[~2016-05-04 14:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 13:59 [PATCH 0/5] Fix poll error returns Charles Keepax
2016-05-04 13:59 ` [PATCH 1/5] ALSA: pcm: Fix poll error return codes Charles Keepax
2016-05-04 23:26 ` Takashi Sakamoto
2016-05-05 9:39 ` Clemens Ladisch
2016-05-05 11:46 ` Charles Keepax
2016-05-06 18:11 ` Takashi Sakamoto
2016-05-04 13:59 ` Charles Keepax [this message]
2016-05-04 13:59 ` [PATCH 3/5] ALSA: compress: Remove pointless NULL check Charles Keepax
2016-05-04 13:59 ` [PATCH 4/5] ALSA: compress: Fix poll error return codes Charles Keepax
2016-05-04 13:59 ` [PATCH v6 RESEND 5/5] ALSA: compress: Replace complex if statement with switch Charles Keepax
2016-05-09 12:13 ` [PATCH 0/5] Fix poll error returns Takashi Iwai
2016-05-09 15:19 ` Vinod Koul
2016-05-09 15:36 ` Takashi Iwai
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=1462370351-15388-3-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--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).