lkml.org 
[lkml]   [2007]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 09/40] ALSA: hda-codec - Avoid zero NID in line_out_pinsof STAC codecs

    -stable review patch. If anyone has any objections, please let us know.

    ------------------
    From: Takashi Iwai <tiwai@suse.de>

    patch c480f79bdca58923e605ff5e4698cfe1779bae70 in mainline

    [ALSA] hda-codec - Avoid zero NID in line_out_pins[] of STAC codecs

    The STAC codes adds line_out_pins[] for shared mic/line-inputs accordingly.
    But, the current code may give a hole with NID=0 in some setting, which
    results in an error at probe. This patch fixes the problem.

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

    ---
    sound/pci/hda/patch_sigmatel.c | 15 ++++++++++-----
    1 file changed, 10 insertions(+), 5 deletions(-)

    --- a/sound/pci/hda/patch_sigmatel.c
    +++ b/sound/pci/hda/patch_sigmatel.c
    @@ -1182,7 +1182,8 @@ static int stac92xx_add_dyn_out_pins(str
    case 3:
    /* add line-in as side */
    if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 3) {
    - cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_LINE];
    + cfg->line_out_pins[cfg->line_outs] =
    + cfg->input_pins[AUTO_PIN_LINE];
    spec->line_switch = 1;
    cfg->line_outs++;
    }
    @@ -1190,12 +1191,14 @@ static int stac92xx_add_dyn_out_pins(str
    case 2:
    /* add line-in as clfe and mic as side */
    if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 2) {
    - cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_LINE];
    + cfg->line_out_pins[cfg->line_outs] =
    + cfg->input_pins[AUTO_PIN_LINE];
    spec->line_switch = 1;
    cfg->line_outs++;
    }
    if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 3) {
    - cfg->line_out_pins[3] = cfg->input_pins[AUTO_PIN_MIC];
    + cfg->line_out_pins[cfg->line_outs] =
    + cfg->input_pins[AUTO_PIN_MIC];
    spec->mic_switch = 1;
    cfg->line_outs++;
    }
    @@ -1203,12 +1206,14 @@ static int stac92xx_add_dyn_out_pins(str
    case 1:
    /* add line-in as surr and mic as clfe */
    if (cfg->input_pins[AUTO_PIN_LINE] && num_dacs > 1) {
    - cfg->line_out_pins[1] = cfg->input_pins[AUTO_PIN_LINE];
    + cfg->line_out_pins[cfg->line_outs] =
    + cfg->input_pins[AUTO_PIN_LINE];
    spec->line_switch = 1;
    cfg->line_outs++;
    }
    if (cfg->input_pins[AUTO_PIN_MIC] && num_dacs > 2) {
    - cfg->line_out_pins[2] = cfg->input_pins[AUTO_PIN_MIC];
    + cfg->line_out_pins[cfg->line_outs] =
    + cfg->input_pins[AUTO_PIN_MIC];
    spec->mic_switch = 1;
    cfg->line_outs++;
    }
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-15 07:59    [W:0.027 / U:1.692 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site