diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-12 14:03:04 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-12 14:03:04 -0400 |
| commit | a6093a24bc7da25ce851d22ce3a7bcf1eaca4a95 (patch) | |
| tree | 608cf7ec7ece949810d7a1bb680b8b52864d6608 /sound | |
| parent | 85e013a18acfad98473a4432bb7082d1fcc74a25 (diff) | |
| parent | 236e6723bedb483b2ebf73ada01e2c853c5cac01 (diff) | |
Merge branch 'topic/asoc' into for-linus
* topic/asoc:
ASoC: Fix lm4857 control
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 16 |
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) | |||
| 345 | static int lm4857_get_reg(struct snd_kcontrol *kcontrol, | 345 | static int lm4857_get_reg(struct snd_kcontrol *kcontrol, |
| 346 | struct snd_ctl_elem_value *ucontrol) | 346 | struct snd_ctl_elem_value *ucontrol) |
| 347 | { | 347 | { |
| 348 | int reg = kcontrol->private_value & 0xFF; | 348 | struct soc_mixer_control *mc = |
| 349 | int shift = (kcontrol->private_value >> 8) & 0x0F; | 349 | (struct soc_mixer_control *)kcontrol->private_value; |
| 350 | int mask = (kcontrol->private_value >> 16) & 0xFF; | 350 | int reg = mc->reg; |
| 351 | int shift = mc->shift; | ||
| 352 | int mask = mc->max; | ||
| 351 | 353 | ||
| 352 | pr_debug("Entered %s\n", __func__); | 354 | pr_debug("Entered %s\n", __func__); |
| 353 | 355 | ||
| @@ -358,9 +360,11 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol, | |||
| 358 | static int lm4857_set_reg(struct snd_kcontrol *kcontrol, | 360 | static int lm4857_set_reg(struct snd_kcontrol *kcontrol, |
| 359 | struct snd_ctl_elem_value *ucontrol) | 361 | struct snd_ctl_elem_value *ucontrol) |
| 360 | { | 362 | { |
| 361 | int reg = kcontrol->private_value & 0xFF; | 363 | struct soc_mixer_control *mc = |
| 362 | int shift = (kcontrol->private_value >> 8) & 0x0F; | 364 | (struct soc_mixer_control *)kcontrol->private_value; |
| 363 | int mask = (kcontrol->private_value >> 16) & 0xFF; | 365 | int reg = mc->reg; |
| 366 | int shift = mc->shift; | ||
| 367 | int mask = mc->max; | ||
| 364 | 368 | ||
| 365 | if (((lm4857_regs[reg] >> shift) & mask) == | 369 | if (((lm4857_regs[reg] >> shift) & mask) == |
| 366 | ucontrol->value.integer.value[0]) | 370 | ucontrol->value.integer.value[0]) |