summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-05-11 16:34:39 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-12 10:28:36 +0200
commit6a45f7822544c54a2cf070d84f4e85f2fb32ec02 (patch)
treebaa6534938d7d46902301b749220bd086144885c
parentb57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff)
downloadop-kernel-dev-6a45f7822544c54a2cf070d84f4e85f2fb32ec02.zip
op-kernel-dev-6a45f7822544c54a2cf070d84f4e85f2fb32ec02.tar.gz
ALSA: virtuoso: fix Xonar D1/DX front panel microphone
Commit 65c3ac885ce9852852b895a4a62212f62cb5f2e9 in 2.6.33 accidentally left out the initialization of the AC97 codec FMIC2MIC bit, which broke recording from the front panel microphone. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@kernel.org> Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/oxygen/xonar_cs43xx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/oxygen/xonar_cs43xx.c b/sound/pci/oxygen/xonar_cs43xx.c
index 16c226b..7c4986b 100644
--- a/sound/pci/oxygen/xonar_cs43xx.c
+++ b/sound/pci/oxygen/xonar_cs43xx.c
@@ -56,6 +56,7 @@
#include <sound/pcm_params.h>
#include <sound/tlv.h>
#include "xonar.h"
+#include "cm9780.h"
#include "cs4398.h"
#include "cs4362a.h"
@@ -172,6 +173,8 @@ static void xonar_d1_init(struct oxygen *chip)
oxygen_clear_bits16(chip, OXYGEN_GPIO_DATA,
GPIO_D1_FRONT_PANEL | GPIO_D1_INPUT_ROUTE);
+ oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+
xonar_init_cs53x1(chip);
xonar_enable_output(chip);
OpenPOWER on IntegriCloud