aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-10 14:53:54 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-10 15:13:24 +0100
commit3b628867f328cfe1ad4811d63961579874f87041 (patch)
tree679f6f55742b6b44d47ad8c211fcdfea21f478a1 /sound/pci
parentALSA: hda - Create "Capture Source" control dynamically in patch_conexant.c (diff)
downloadlinux-dev-3b628867f328cfe1ad4811d63961579874f87041.tar.xz
linux-dev-3b628867f328cfe1ad4811d63961579874f87041.zip
ALSA: hda - Remove superfluous verbs for Cxt5047 laptop-eapd model
Remove superfluous verbs from cxt5047_toshiba_init_verbs[]. Also fix comments and minor coding style issues. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index d5d736ff7c6c..e9e47574c613 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1377,12 +1377,9 @@ static struct hda_verb cxt5047_init_verbs[] = {
/* configuration for Toshiba Laptops */
static struct hda_verb cxt5047_toshiba_init_verbs[] = {
- {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0 }, /* default on */
- /* pin sensing on HP and Mic jacks */
- {0x13, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_HP_EVENT},
- {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | CONEXANT_MIC_EVENT},
+ {0x13, AC_VERB_SET_EAPD_BTLENABLE, 0x0}, /* default off */
/* Speaker routing */
- {0x1d, AC_VERB_SET_CONNECT_SEL,0x1},
+ {0x1d, AC_VERB_SET_CONNECT_SEL, 0x1},
{}
};