aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/max98088.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/max98088.c')
-rw-r--r--sound/soc/codecs/max98088.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index bc22ee93a75..ef06007d889 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1224,15 +1224,17 @@ static const struct snd_soc_dapm_route audio_map[] = {
1224 1224
1225static int max98088_add_widgets(struct snd_soc_codec *codec) 1225static int max98088_add_widgets(struct snd_soc_codec *codec)
1226{ 1226{
1227 snd_soc_dapm_new_controls(codec, max98088_dapm_widgets, 1227 struct snd_soc_dapm_context *dapm = &codec->dapm;
1228
1229 snd_soc_dapm_new_controls(dapm, max98088_dapm_widgets,
1228 ARRAY_SIZE(max98088_dapm_widgets)); 1230 ARRAY_SIZE(max98088_dapm_widgets));
1229 1231
1230 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); 1232 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
1231 1233
1232 snd_soc_add_controls(codec, max98088_snd_controls, 1234 snd_soc_add_controls(codec, max98088_snd_controls,
1233 ARRAY_SIZE(max98088_snd_controls)); 1235 ARRAY_SIZE(max98088_snd_controls));
1234 1236
1235 snd_soc_dapm_new_widgets(codec); 1237 snd_soc_dapm_new_widgets(dapm);
1236 return 0; 1238 return 0;
1237} 1239}
1238 1240
@@ -1617,7 +1619,7 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec,
1617 break; 1619 break;
1618 1620
1619 case SND_SOC_BIAS_STANDBY: 1621 case SND_SOC_BIAS_STANDBY:
1620 if (codec->bias_level == SND_SOC_BIAS_OFF) 1622 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF)
1621 max98088_sync_cache(codec); 1623 max98088_sync_cache(codec);
1622 1624
1623 snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN, 1625 snd_soc_update_bits(codec, M98088_REG_4C_PWR_EN_IN,
@@ -1630,7 +1632,7 @@ static int max98088_set_bias_level(struct snd_soc_codec *codec,
1630 codec->cache_sync = 1; 1632 codec->cache_sync = 1;
1631 break; 1633 break;
1632 } 1634 }
1633 codec->bias_level = level; 1635 codec->dapm.bias_level = level;
1634 return 0; 1636 return 0;
1635} 1637}
1636 1638