Re: [alsa-devel] [PATCH 2/6] sound/pci/hda: Rename capture sources of CX20549 to match common conventions

5 Apr 2012

At Thu, 05 Apr 2012 15:30:06 +0200,
Michael Karcher wrote:
...

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 8c6523b..7d92aac 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -687,18 +687,18 @@ static const struct hda_channel_mode cxt5045_modes[1] = {
 static const struct hda_input_mux cxt5045_capture_source = {
   .num_items = 2,
   .items = {

{ "IntMic", 0x1 },


{ "ExtMic", 0x2 },




{ "Internal Mic", 0x1 },


{ "Mic", 0x2 },

}

};
static const struct hda_input_mux cxt5045_capture_source_benq = {
   .num_items = 5,
   .items = {

{ "IntMic", 0x1 },


{ "ExtMic", 0x2 },


{ "LineIn", 0x3 },

{ "CD",     0x4 },


{ "Internal Mic", 0x1 },


{ "Mic", 0x2 },


{ "Line In", 0x3 },



This could be simply "Line".
Other than that, looks good.
Takashi

    

Takashi Iwai