From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 30 May 2017 15:33:17 +0000 (+0200)
Subject: pcm: dshare: Call snd_pcm_dshare_state() directly
X-Git-Tag: v1.1.4.1~2
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=bb862e3bb16ada990e03a0ad24ac2ea209f48631;p=alsa-lib.git

pcm: dshare: Call snd_pcm_dshare_state() directly

... otherwise it may be a deadlock if recursive lock isn't available.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index 4c57fb4a..7cdfea2a 100644
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -227,6 +227,8 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm)
  *  plugin implementation
  */
 
+static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm);
+
 static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
 {
 	snd_pcm_direct_t *dshare = pcm->private_data;
@@ -244,7 +246,7 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
 	default:
 		break;
 	}
-	status->state = snd_pcm_state(pcm);
+	status->state = snd_pcm_dshare_state(pcm);
 	status->trigger_tstamp = dshare->trigger_tstamp;
 	status->avail = snd_pcm_mmap_playback_avail(pcm);
 	status->avail_max = status->avail > dshare->avail_max ? status->avail : dshare->avail_max;