lkml.org 
[lkml]   [2015]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 57/60] ALSA: hda - fix cs4210_spdif_automute()
    Date
    3.13.11-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    sound/pci/hda/patch_cirrus.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
    index 51e2080..7b0aac9 100644
    --- a/sound/pci/hda/patch_cirrus.c
    +++ b/sound/pci/hda/patch_cirrus.c
    @@ -1002,9 +1002,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);
    }
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-09-02 03:21    [W:4.037 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site