OSDN Git Service

pcm: Don't assert in _snd_pcm_hw_params_internal()
authorTakashi Iwai <tiwai@suse.de>
Mon, 1 Jun 2015 11:45:01 +0000 (13:45 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Jun 2015 11:46:40 +0000 (13:46 +0200)
It's no fatal error from sw params, and it's really bad habit to use
assert() and abort the operation as a system library.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/pcm/pcm_params.c

index 1d667a5..60d99ad 100644 (file)
@@ -2361,7 +2361,8 @@ int _snd_pcm_hw_params_internal(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
        memset(&sw, 0, sizeof(sw));
        snd_pcm_sw_params_default(pcm, &sw);
        err = snd_pcm_sw_params(pcm, &sw);
-       assert(err >= 0);
+       if (err < 0)
+               return err;
 
        if (pcm->mmap_rw || 
            pcm->access == SND_PCM_ACCESS_MMAP_INTERLEAVED ||