lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 263/272] ALSA: hda - Check keep_eapd_on before inv_eapd
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 468ac413045af1e0e4d1272291bed6878f248a69 upstream.

    We don't change the EAPD bit in set_pin_eapd() if keep_eapd_on flag is
    set by the codec driver and enable is false. But, we also apply the
    flipping of enable value according to inv_eapd flag in the same
    function, and this confused the former check, handled as if it's
    turned ON. The inverted EAPD check must be applied after keep_eapd_on
    check, instead.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/pci/hda/hda_generic.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
    index 02fdff6..c6cb67b 100644
    --- a/sound/pci/hda/hda_generic.c
    +++ b/sound/pci/hda/hda_generic.c
    @@ -789,10 +789,10 @@ static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)
    if (spec->own_eapd_ctl ||
    !(snd_hda_query_pin_caps(codec, pin) & AC_PINCAP_EAPD))
    return;
    - if (codec->inv_eapd)
    - enable = !enable;
    if (spec->keep_eapd_on && !enable)
    return;
    + if (codec->inv_eapd)
    + enable = !enable;
    snd_hda_codec_update_cache(codec, pin, 0,
    AC_VERB_SET_EAPD_BTLENABLE,
    enable ? 0x02 : 0x00);
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:01    [W:4.022 / U:0.600 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site