]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: hda - fix cs4210_spdif_automute()
authorDan Carpenter <dan.carpenter@oracle.com>
Sat, 25 Jul 2015 00:03:38 +0000 (03:03 +0300)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 25 Aug 2015 09:13:50 +0000 (10:13 +0100)
commit 44008f0896ae205b02b0882dbf807f0de149efc4 upstream.

Smatch complains that we have nested checks for "spdif_present".  It
turns out the current behavior isn't correct, we should remove the first
check and keep the second.

Fixes: 1077a024812d ('ALSA: hda - Use generic parser for Cirrus codec driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
sound/pci/hda/patch_cirrus.c

index 6928c32901636076cb2a2fd8afe4807b601eed65..e5a2dccceea1687ce5400dccc8f77332bc5ac211 100644 (file)
@@ -1001,9 +1001,7 @@ static void cs4210_spdif_automute(struct hda_codec *codec,
 
        spec->spdif_present = spdif_present;
        /* SPDIF TX on/off */
-       if (spdif_present)
-               snd_hda_set_pin_ctl(codec, spdif_pin,
-                                   spdif_present ? PIN_OUT : 0);
+       snd_hda_set_pin_ctl(codec, spdif_pin, spdif_present ? PIN_OUT : 0);
 
        cs_automute(codec);
 }