* [PATCH] pcm: fix return value of snd_pcm_ioplug_sw_params()
@ 2016-07-13 14:15 Takashi Sakamoto
2016-07-13 14:37 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Sakamoto @ 2016-07-13 14:15 UTC (permalink / raw)
To: tiwai; +Cc: alsa-devel
In former commits for thread-safe PCM APIs, snd_pcm_ioplug_sw_params() got
0 as its return value, against the original implementation.
This commit fixes it.
Fixes: 54931e5a5455('pcm: Add thread-safety to PCM API')
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
src/pcm/pcm_ioplug.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c
index 115d89b..1dc198e 100644
--- a/src/pcm/pcm_ioplug.c
+++ b/src/pcm/pcm_ioplug.c
@@ -434,14 +434,16 @@ static int snd_pcm_ioplug_hw_free(snd_pcm_t *pcm)
static int snd_pcm_ioplug_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params)
{
ioplug_priv_t *io = pcm->private_data;
- int err = 0;
+ int err;
- if (io->data->callback->sw_params) {
- snd_pcm_unlock(pcm); /* to avoid deadlock */
- err = io->data->callback->sw_params(io->data, params);
- snd_pcm_lock(pcm);
- }
- return 0;
+ if (!io->data->callback->sw_params)
+ return 0;
+
+ snd_pcm_unlock(pcm); /* to avoid deadlock */
+ err = io->data->callback->sw_params(io->data, params);
+ snd_pcm_lock(pcm);
+
+ return err;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pcm: fix return value of snd_pcm_ioplug_sw_params()
2016-07-13 14:15 [PATCH] pcm: fix return value of snd_pcm_ioplug_sw_params() Takashi Sakamoto
@ 2016-07-13 14:37 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2016-07-13 14:37 UTC (permalink / raw)
To: Takashi Sakamoto; +Cc: alsa-devel
On Wed, 13 Jul 2016 16:15:23 +0200,
Takashi Sakamoto wrote:
>
> In former commits for thread-safe PCM APIs, snd_pcm_ioplug_sw_params() got
> 0 as its return value, against the original implementation.
>
> This commit fixes it.
>
> Fixes: 54931e5a5455('pcm: Add thread-safety to PCM API')
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Thanks, applied this one, too.
Takashi
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-13 14:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-13 14:15 [PATCH] pcm: fix return value of snd_pcm_ioplug_sw_params() Takashi Sakamoto
2016-07-13 14:37 ` Takashi Iwai
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.