pcm: Fix secondary retry in dsnoop and dshare

The commit [fdba9e1bad8f: pcm: Fallback open as the first instance for
dmix & co] introduced a mechanism to retry the open of slave PCM for
the secondary streams, but this also introduced a regression in dsnoop
and dshare plugins: since the retry goto-tag was placed at a wrong
position, it retries to re-fetch the shm unnecessarily and eventually
leads to the fatal error.

The bug can be easily reproduced by starting arecord and killing it
via SIGKILL, then starting arecord again.  The second arecord fails.

The fix is obviously to move the wrong retry goto-tags to the right
positions.

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

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index adb3587a2869143b985f2fff5e15f786ee52fde9..05854dedf259f20e44009ce0b6b88d3f75015ab3 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -690,7 +690,6 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
                break;
        }
 
- retry:
        first_instance = ret = snd_pcm_direct_shm_create_or_connect(dshare);
        if (ret < 0) {
                SNDERR("unable to create IPC shm instance");
@@ -705,6 +704,7 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
        dshare->max_periods = opts->max_periods;
        dshare->sync_ptr = snd_pcm_dshare_sync_ptr;
 
+ retry:
        if (first_instance) {
                /* recursion is already checked in
                   snd_pcm_direct_get_slave_ipc_offset() */

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index 8ff0ba57cb144b808f87223e9edcf7ca2164fdd1..2d45171dda01e30a34d58e12d9ee3ff35657ccbc 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -583,7 +583,6 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
                break;
        }
                
- retry:
        first_instance = ret = snd_pcm_direct_shm_create_or_connect(dsnoop);
        if (ret < 0) {
                SNDERR("unable to create IPC shm instance");
@@ -598,6 +597,7 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
        dsnoop->max_periods = opts->max_periods;
        dsnoop->sync_ptr = snd_pcm_dsnoop_sync_ptr;
 
+ retry:
        if (first_instance) {
                /* recursion is already checked in
                   snd_pcm_direct_get_slave_ipc_offset() */