summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:04 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:04 +0200
commita6093a24bc7da25ce851d22ce3a7bcf1eaca4a95 (patch)
tree608cf7ec7ece949810d7a1bb680b8b52864d6608
parent85e013a18acfad98473a4432bb7082d1fcc74a25 (diff)
parent236e6723bedb483b2ebf73ada01e2c853c5cac01 (diff)
downloadlinux-3.10-a6093a24bc7da25ce851d22ce3a7bcf1eaca4a95.tar.gz
linux-3.10-a6093a24bc7da25ce851d22ce3a7bcf1eaca4a95.tar.bz2
linux-3.10-a6093a24bc7da25ce851d22ce3a7bcf1eaca4a95.zip
Merge branch 'topic/asoc' into for-linus
* topic/asoc: ASoC: Fix lm4857 control
-rw-r--r--sound/soc/s3c24xx/neo1973_wm8753.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 289fadf60b1..906709e6dd5 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -345,9 +345,11 @@ static void lm4857_write_regs(void)
static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- int reg = kcontrol->private_value & 0xFF;
- int shift = (kcontrol->private_value >> 8) & 0x0F;
- int mask = (kcontrol->private_value >> 16) & 0xFF;
+ struct soc_mixer_control *mc =
+ (struct soc_mixer_control *)kcontrol->private_value;
+ int reg = mc->reg;
+ int shift = mc->shift;
+ int mask = mc->max;
pr_debug("Entered %s\n", __func__);
@@ -358,9 +360,11 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
static int lm4857_set_reg(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
- int reg = kcontrol->private_value & 0xFF;
- int shift = (kcontrol->private_value >> 8) & 0x0F;
- int mask = (kcontrol->private_value >> 16) & 0xFF;
+ struct soc_mixer_control *mc =
+ (struct soc_mixer_control *)kcontrol->private_value;
+ int reg = mc->reg;
+ int shift = mc->shift;
+ int mask = mc->max;
if (((lm4857_regs[reg] >> shift) & mask) ==
ucontrol->value.integer.value[0])