Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=accbe4988c5cf3dc86f0a042396163ed279536a6
Commit:     accbe4988c5cf3dc86f0a042396163ed279536a6
Parent:     a3a68c85bfb7acc874ce6d334964b95943d4ed43
Author:     zhejiang <[EMAIL PROTECTED]>
AuthorDate: Fri Aug 31 12:36:05 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 15:59:38 2007 +0200

    [ALSA] hda-codec - Fix capture on ALC262 HP machines
    
    Fix the index for Front Mic capture source on ALC262 HP machines.
    Also, added the new capture source list for HP BPC DC7000 series
    to work properly.
    From: zhejiang <[EMAIL PROTECTED]>
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_realtek.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b3062af..3557865 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -7746,13 +7746,23 @@ static struct hda_input_mux alc262_HP_capture_source = {
        .num_items = 5,
        .items = {
                { "Mic", 0x0 },
-               { "Front Mic", 0x3 },
+               { "Front Mic", 0x1 },
                { "Line", 0x2 },
                { "CD", 0x4 },
                { "AUX IN", 0x6 },
        },
 };
 
+static struct hda_input_mux alc262_HP_D7000_capture_source = {
+       .num_items = 4,
+       .items = {
+               { "Mic", 0x0 },
+               { "Front Mic", 0x2 },
+               { "Line", 0x1 },
+               { "CD", 0x4 },
+       },
+};
+
 /* mute/unmute internal speaker according to the hp jack and mute state */
 static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
 {
@@ -8357,7 +8367,7 @@ static struct alc_config_preset alc262_presets[] = {
                .hp_nid = 0x03,
                .num_channel_mode = ARRAY_SIZE(alc262_modes),
                .channel_mode = alc262_modes,
-               .input_mux = &alc262_HP_capture_source,
+               .input_mux = &alc262_HP_D7000_capture_source,
        },
        [ALC262_HP_BPC_D7000_WL] = {
                .mixers = { alc262_HP_BPC_WildWest_mixer,
@@ -8368,7 +8378,7 @@ static struct alc_config_preset alc262_presets[] = {
                .hp_nid = 0x03,
                .num_channel_mode = ARRAY_SIZE(alc262_modes),
                .channel_mode = alc262_modes,
-               .input_mux = &alc262_HP_capture_source,
+               .input_mux = &alc262_HP_D7000_capture_source,
        },
        [ALC262_BENQ_ED8] = {
                .mixers = { alc262_base_mixer },
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to