diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-16 11:45:55 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-16 11:45:55 +0100 |
commit | abfe69dd2e313d0c8226ca4a12329e3d829cfd7c (patch) | |
tree | d4d4c2d4d7a3aa5284a061eb23b41986ccacedfd /sound/soc/codecs/cs42l52.h | |
parent | ALSA: hda - load EQ params into IDT codec on HP bNB13 systems (diff) | |
parent | Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus (diff) | |
download | linux-abfe69dd2e313d0c8226ca4a12329e3d829cfd7c.tar.xz linux-abfe69dd2e313d0c8226ca4a12329e3d829cfd7c.zip |
Merge tag 'asoc-v3.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty
issues for users of those drivers if they run into them.
Diffstat (limited to 'sound/soc/codecs/cs42l52.h')
-rw-r--r-- | sound/soc/codecs/cs42l52.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.h b/sound/soc/codecs/cs42l52.h index 1a9412d86d17..6fb8f00f4191 100644 --- a/sound/soc/codecs/cs42l52.h +++ b/sound/soc/codecs/cs42l52.h @@ -179,7 +179,7 @@ #define CS42L52_MICB_CTL 0x11 #define CS42L52_MIC_CTL_MIC_SEL_MASK 0xBF #define CS42L52_MIC_CTL_MIC_SEL_SHIFT 6 -#define CS42L52_MIC_CTL_TYPE_MASK 0xDF +#define CS42L52_MIC_CTL_TYPE_MASK 0x20 #define CS42L52_MIC_CTL_TYPE_SHIFT 5 |