summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2007-10-30 08:59:14 +0100
committerJaroslav Kysela <perex@perex.cz>2007-11-19 18:38:32 +0100
commit56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa (patch)
treefb6a3005eca1324dfc19d6a1a8b1ef0bcd5febfc /sound
parentd29240ce57d96db7300360d1e6f18357810a5c2b (diff)
downloadlinux-3.10-56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa.tar.gz
linux-3.10-56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa.tar.bz2
linux-3.10-56c36ca3b2df3ad8f2a3b7d3fba3670695163aaa.zip
[ALSA] cmipci: fix FLINKON/OFF bits
Fix the definitions of the CM_FLINKON/CM_FLINKOFF register bits that were garbled in the last 'update register definitions' patch. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/cmipci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 6832649879c..1fa5f004e85 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -246,10 +246,9 @@ MODULE_PARM_DESC(joystick_port, "Joystick port address.");
#define CM_MMODE_MASK 0x00000E00 /* model DAA interface mode */
#define CM_SPDIF_SELECT2 0x00000100 /* for model > 039 ? */
#define CM_ENCENTER 0x00000080
-#define CM_FLINKON 0x00000080 /* force modem link detection on, model 037 */
+#define CM_FLINKON 0x00000040 /* force modem link detection on, model 037 */
#define CM_MUTECH1 0x00000040 /* mute PCI ch1 to DAC */
-#define CM_FLINKOFF 0x00000040 /* force modem link detection off, model 037 */
-#define CM_UNKNOWN_18_5 0x00000020 /* ? */
+#define CM_FLINKOFF 0x00000020 /* force modem link detection off, model 037 */
#define CM_MIDSMP 0x00000010 /* 1/2 interpolation at front end DAC */
#define CM_UPDDMA_MASK 0x0000000C /* TDMA position update notification */
#define CM_UPDDMA_2048 0x00000000