[pulseaudio-commits] Branch 'next' - src/modules

[Tanu Kaskinen]

 src/modules/alsa/alsa-mixer.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bd51c7220854f04acfdc75a5c8fa0e660e4738f3
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Wed Jan 29 20:59:00 2014 +0200

    alsa: Remove a redundant check
    
    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.

diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 99de0ec..4357e52 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -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;
     }