From 2af01a0aeb8a1b33c5082aa04559a36944a947c9 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Feb 2012 11:59:45 +0100 Subject: [PATCH] --- yaml --- r: 293099 b: refs/heads/master c: 5803a326465e38ee3cab8badbd8947732a8277f5 h: refs/heads/master i: 293097: dd1f5e9684fb9b3393f939dd76dbc6c68f7da409 293095: d9094c1d7f52346a74ad7fb0b1a2bfd5ec399fb3 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_realtek.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 88379c31ff6e..25e527826b2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 164f73ee93131f67a61eaca6a6f6180580c39445 +refs/heads/master: 5803a326465e38ee3cab8badbd8947732a8277f5 diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index eba50dff6130..997cc8127a08 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -302,6 +302,9 @@ static int alc_mux_select(struct hda_codec *codec, unsigned int adc_idx, int i, type, num_conns; hda_nid_t nid; + if (!spec->input_mux) + return 0; + mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx; imux = &spec->input_mux[mux_idx]; if (!imux->num_items && mux_idx > 0)