public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: torvalds@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org
Subject: [PATCH 12/16] [ALSA] hda-codec - Fix ALC882 capture source selection
Date: Fri, 22 Feb 2008 18:45:30 +0100	[thread overview]
Message-ID: <s5h63wgyjet.wl%tiwai@suse.de> (raw)
In-Reply-To: <s5hoda8yjza.wl%tiwai@suse.de>

The capture source selection for ADC list with two elements is buggy
becaues of a wrong capture mux list.  This patch fixes the starting
index based on spec->num_adc_nids.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_realtek.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2a463c9..777f8c0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5227,10 +5227,14 @@ static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol,
 	const struct hda_input_mux *imux = spec->input_mux;
 	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
 	static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
-	hda_nid_t nid = capture_mixers[adc_idx];
+	hda_nid_t nid;
 	unsigned int *cur_val = &spec->cur_mux[adc_idx];
 	unsigned int i, idx;
 
+	if (spec->num_adc_nids < 3)
+		nid = capture_mixers[adc_idx + 1];
+	else
+		nid = capture_mixers[adc_idx];
 	idx = ucontrol->value.enumerated.item[0];
 	if (idx >= imux->num_items)
 		idx = imux->num_items - 1;
-- 
1.5.3.8


  parent reply	other threads:[~2008-02-22 17:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-22 17:33 [PATCH 0/16] ALSA fixes for 2.6.25-rc2 Takashi Iwai
2008-02-22 17:34 ` [PATCH 01/16] [ALSA] opl3 - Fix compilation without sequencer support Takashi Iwai
2008-02-22 17:34 ` [PATCH 02/16] [ALSA] race between disconnect and error handling in usbmidi Takashi Iwai
2008-02-22 17:35 ` [PATCH 03/16] [ALSA] oxygen - Fix section mismatch Takashi Iwai
2008-02-22 17:35 ` [PATCH 04/16] [ALSA] hdsp " Takashi Iwai
2008-02-22 17:36 ` [PATCH 05/16] [ALSA] HDA - enable snoop on SCH Takashi Iwai
2008-02-22 17:36 ` [PATCH 06/16] [ALSA] hda-codec - Fix SPDIF output on Conexant 5045 codec Takashi Iwai
2008-02-22 17:40 ` [PATCH 07/16] [ALSA] oxygen: fix line-in recording selection Takashi Iwai
2008-02-22 17:41 ` [PATCH 08/16] [ALSA] soc - duplicate strcasecmp test for "rj-master" in mpc8610_hpcd_probe() Takashi Iwai
2008-02-22 17:43 ` [PATCH 09/16] [ALSA] hda-codec - Fix race condition in generic bound volume/swtich controls Takashi Iwai
2008-02-22 17:43 ` [PATCH 10/16] [ALSA] hda-codec - Don't create vmaster if no slaves found Takashi Iwai
2008-02-22 17:44 ` [PATCH 11/16] [ALSA] hda-codec - Fix wrong capture source selection for ALC883 codec Takashi Iwai
2008-02-22 17:45 ` Takashi Iwai [this message]
2008-02-22 17:46 ` [PATCH 13/16] [ALSA] hda-codec - Fix amp-in values for pin widgets Takashi Iwai
2008-02-22 17:46 ` [PATCH 14/16] [ALSA] caiaq - fix section mismatch warning Takashi Iwai
2008-02-22 18:31   ` Sam Ravnborg
2008-02-23 10:23     ` Takashi Iwai
2008-02-22 17:47 ` [PATCH 15/16] [ALSA] hda-intel - Fix Oops with ATI HDMI devices Takashi Iwai
2008-02-22 17:47 ` [PATCH 16/16] [ALSA] bt87X: fix freeing of shared interrupt Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=s5h63wgyjet.wl%tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox