aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMichael Karcher <kernel@mkarcher.dialup.fu-berlin.de>2012-04-06 15:34:18 +0200
committerTakashi Iwai <tiwai@suse.de>2012-04-07 12:25:40 +0200
commite6e03daecd2c82437b550ad1a62052c22fdb2b5b (patch)
tree9d2a7daeeb2903d2258b89d0af5a99b6e29955da /sound
parentcbf2d28e83d47792bd7af000017042dbc59f5df6 (diff)
downloadlinux-e6e03daecd2c82437b550ad1a62052c22fdb2b5b.tar.gz
ALSA: hda - Remove CD control from model=benq for CX20549
The ID used for detection of the BenQ R55E actually identifies the Quanta TW3 ODM design, which is also used for the Gigabyte W551 laptop series. Schematics on the internet clearly indicate that the "Port C" (analog input connected to record source #4 and mixer input #4) is unconnected. Playing an audio CD through analog playback (using cdplay from cdtools) produces no sound, even with the mixer input labelled "CD" enabled, and the volume control in the CD drive set to maximum. This indicates the connection is really not present. Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_conexant.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 4b51c8f2fda..4b365488c58 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -692,9 +692,8 @@ static const struct hda_input_mux cxt5045_capture_source = {
};
static const struct hda_input_mux cxt5045_capture_source_benq = {
- .num_items = 5,
+ .num_items = 4,
.items = {
- { "CD", 0x4 },
{ "Internal Mic", 0x1 },
{ "Mic", 0x2 },
{ "Line", 0x3 },
@@ -819,9 +818,6 @@ static const struct snd_kcontrol_new cxt5045_mixers[] = {
};
static const struct snd_kcontrol_new cxt5045_benq_mixers[] = {
- HDA_CODEC_VOLUME("CD Playback Volume", 0x17, 0x4, HDA_INPUT),
- HDA_CODEC_MUTE("CD Playback Switch", 0x17, 0x4, HDA_INPUT),
-
HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x3, HDA_INPUT),
HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x3, HDA_INPUT),