summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2021-06-02 19:39:32 +0200
committerJaroslav Kysela <perex@perex.cz>2021-06-02 19:39:32 +0200
commit01a45aec6fcd5a5378a5b5e0ae0f9dacde2068e4 (patch)
tree2c492aa0b286e9e46f7b0ee64e4b12cbef3148e1
parenteb95cad4e22a0bf2577f1fa4a3f6fd18caed3362 (diff)
downloadalsa-lib-01a45aec6fcd5a5378a5b5e0ae0f9dacde2068e4.tar.gz
pcm: remove extra NULL checks in snd_pcm_dsnoop_open()
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r--src/pcm/pcm_dsnoop.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index fb1b02c2..2c3b9f43 100644
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -564,8 +564,8 @@ int snd_pcm_dsnoop_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 *dsnoop = NULL;
+ snd_pcm_t *pcm, *spcm = NULL;
+ snd_pcm_direct_t *dsnoop;
int ret, first_instance;
assert(pcmp);
@@ -708,12 +708,9 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
snd_pcm_direct_semaphore_up(dsnoop, DIRECT_IPC_SEM_CLIENT);
_err_nosem:
- if (dsnoop) {
- free(dsnoop->bindings);
- free(dsnoop);
- }
- if (pcm)
- snd_pcm_free(pcm);
+ free(dsnoop->bindings);
+ free(dsnoop);
+ snd_pcm_free(pcm);
return ret;
}