lkml.org 
[lkml]   [2012]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 04/42] ALSA: hda/conexant - Dont set HP pin-control bit unconditionally
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit ca3649de026ff95c6f2847e8d096cf2f411c02b3 upstream.

    Some output pins on Conexant chips have no HP control bit, but the
    auto-parser initializes these pins unconditionally with PIN_HP.

    Check the pin-capability and avoid the HP bit if not supported.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/pci/hda/patch_conexant.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/sound/pci/hda/patch_conexant.c
    +++ b/sound/pci/hda/patch_conexant.c
    @@ -4003,9 +4003,14 @@ static void cx_auto_init_output(struct h
    int i;

    mute_outputs(codec, spec->multiout.num_dacs, spec->multiout.dac_nids);
    - for (i = 0; i < cfg->hp_outs; i++)
    + for (i = 0; i < cfg->hp_outs; i++) {
    + unsigned int val = PIN_OUT;
    + if (snd_hda_query_pin_caps(codec, cfg->hp_pins[i]) &
    + AC_PINCAP_HP_DRV)
    + val |= AC_PINCTL_HP_EN;
    snd_hda_codec_write(codec, cfg->hp_pins[i], 0,
    - AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP);
    + AC_VERB_SET_PIN_WIDGET_CONTROL, val);
    + }
    mute_outputs(codec, cfg->hp_outs, cfg->hp_pins);
    mute_outputs(codec, cfg->line_outs, cfg->line_out_pins);
    mute_outputs(codec, cfg->speaker_outs, cfg->speaker_pins);



    \
     
     \ /
      Last update: 2012-04-25 00:51    [W:0.022 / U:60.380 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site