projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b57f95a
)
ALSA: virtuoso: fix Xonar D1/DX front panel microphone
author
Clemens Ladisch
<
[email protected]
>
Tue, 11 May 2010 14:34:39 +0000
(16:34 +0200)
committer
Takashi Iwai
<
[email protected]
>
Wed, 12 May 2010 08:28:36 +0000
(10:28 +0200)
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 <
[email protected]
>
Cc: <
[email protected]
>
Signed-off-by: Jaroslav Kysela <
[email protected]
>
Signed-off-by: Takashi Iwai <
[email protected]
>
sound/pci/oxygen/xonar_cs43xx.c
patch
|
blob
|
history
diff --git
a/sound/pci/oxygen/xonar_cs43xx.c
b/sound/pci/oxygen/xonar_cs43xx.c
index 16c226bfcd2bc945e795c7bab877cfeb71f9b055..7c4986b27f2b07bd8faa7d824a0056d1db821308 100644
(file)
--- 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);