Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.15
  [ALSA] emu10k1 - Check value ranges in ctl callbacks
  [ALSA] emu10k1: Add mixer controls parameter checking.
  [ALSA] fix private data pointer calculation in CS4270 driver
  [ALSA] portman2x4 - Fix probe error
  [ALSA] ca0106 - Fix write proc assignment
  [ALSA] s3c2443-ac97: compilation fix
  [ALSA] hda-codec - Revert volume knob controls in STAC codecs
  [ALSA] ca0106 - Check value range in ctl callbacks
  [ALSA] hda-codec - Check PINCAP only for PIN widgets
  [ALSA] mpu401: fix recursive locking in timer
  [ALSA] cmipci: fix FLINKON/OFF bits
  [ALSA] hda-codec - Disable shared stream on AD1986A

1 files changed, 2 insertions, 3 deletions

diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 6832649879ce..1fa5f004e858 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