]> code.delx.au - pulseaudio/commitdiff
alsa: Remove a redundant check
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>
Wed, 29 Jan 2014 18:59:00 +0000 (20:59 +0200)
committerTanu Kaskinen <tanuk@iki.fi>
Mon, 3 Mar 2014 16:06:21 +0000 (18:06 +0200)
If mixer_handle is not NULL, then hctl_handle won't be NULL either.
The redundant check was confusing, because it looked like we would
leak the mixer_handle if mixer_handle is non-NULL and hctl_handle is
NULL.

src/modules/alsa/alsa-mixer.c

index 99de0ec1e05915d2449f32bcf43c5e13e8a8ccf0..4357e52b30d73f8873e4381578e2a90b0b03747a 100644 (file)
@@ -3776,8 +3776,8 @@ static void mapping_paths_probe(pa_alsa_mapping *m, pa_alsa_profile *profile,
     pa_assert(pcm_handle);
 
     mixer_handle = pa_alsa_open_mixer_for_pcm(pcm_handle, NULL, &hctl_handle);
-    if (!mixer_handle || !hctl_handle) {
-         /* Cannot open mixer, remove all entries */
+    if (!mixer_handle) {
+        /* Cannot open mixer, remove all entries */
         pa_hashmap_remove_all(ps->paths);
         return;
     }