aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/codecs/wm8985.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index 9918152a03c7..6ac76fe116b0 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -531,9 +531,9 @@ static int eqmode_get(struct snd_kcontrol *kcontrol,
531 531
532 reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); 532 reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF);
533 if (reg & WM8985_EQ3DMODE) 533 if (reg & WM8985_EQ3DMODE)
534 ucontrol->value.integer.value[0] = 1; 534 ucontrol->value.enumerated.item[0] = 1;
535 else 535 else
536 ucontrol->value.integer.value[0] = 0; 536 ucontrol->value.enumerated.item[0] = 0;
537 537
538 return 0; 538 return 0;
539} 539}
@@ -545,18 +545,18 @@ static int eqmode_put(struct snd_kcontrol *kcontrol,
545 unsigned int regpwr2, regpwr3; 545 unsigned int regpwr2, regpwr3;
546 unsigned int reg_eq; 546 unsigned int reg_eq;
547 547
548 if (ucontrol->value.integer.value[0] != 0 548 if (ucontrol->value.enumerated.item[0] != 0
549 && ucontrol->value.integer.value[0] != 1) 549 && ucontrol->value.enumerated.item[0] != 1)
550 return -EINVAL; 550 return -EINVAL;
551 551
552 reg_eq = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); 552 reg_eq = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF);
553 switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) { 553 switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) {
554 case 0: 554 case 0:
555 if (!ucontrol->value.integer.value[0]) 555 if (!ucontrol->value.enumerated.item[0])
556 return 0; 556 return 0;
557 break; 557 break;
558 case 1: 558 case 1:
559 if (ucontrol->value.integer.value[0]) 559 if (ucontrol->value.enumerated.item[0])
560 return 0; 560 return 0;
561 break; 561 break;
562 } 562 }
@@ -573,7 +573,7 @@ static int eqmode_put(struct snd_kcontrol *kcontrol,
573 /* set the desired eqmode */ 573 /* set the desired eqmode */
574 snd_soc_update_bits(codec, WM8985_EQ1_LOW_SHELF, 574 snd_soc_update_bits(codec, WM8985_EQ1_LOW_SHELF,
575 WM8985_EQ3DMODE_MASK, 575 WM8985_EQ3DMODE_MASK,
576 ucontrol->value.integer.value[0] 576 ucontrol->value.enumerated.item[0]
577 << WM8985_EQ3DMODE_SHIFT); 577 << WM8985_EQ3DMODE_SHIFT);
578 /* restore DAC/ADC configuration */ 578 /* restore DAC/ADC configuration */
579 snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2); 579 snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2);