OSDN Git Service

pcm: remove extra NULL checks in snd_pcm_dshare_open()
authorJaroslav Kysela <perex@perex.cz>
Wed, 2 Jun 2021 17:46:46 +0000 (19:46 +0200)
committerJaroslav Kysela <perex@perex.cz>
Wed, 2 Jun 2021 17:46:58 +0000 (19:46 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/pcm/pcm_dshare.c

index 0f5238a..a918512 100644 (file)
@@ -690,8 +690,8 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
                        snd_config_t *root, snd_config_t *sconf,
                        snd_pcm_stream_t stream, int mode)
 {
-       snd_pcm_t *pcm = NULL, *spcm = NULL;
-       snd_pcm_direct_t *dshare = NULL;
+       snd_pcm_t *pcm, *spcm = NULL;
+       snd_pcm_direct_t *dshare;
        int ret, first_instance;
        unsigned int chn;
 
@@ -851,12 +851,9 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
        } else
                snd_pcm_direct_semaphore_up(dshare, DIRECT_IPC_SEM_CLIENT);
  _err_nosem:
-       if (dshare) {
-               free(dshare->bindings);
-               free(dshare);
-       }
-       if (pcm)
-               snd_pcm_free(pcm);
+       free(dshare->bindings);
+       free(dshare);
+       snd_pcm_free(pcm);
        return ret;
 }