diff options
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
-rw-r--r-- | sound/soc/codecs/wm8993.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c index 67fe5ccc6082..bcc54be572ce 100644 --- a/sound/soc/codecs/wm8993.c +++ b/sound/soc/codecs/wm8993.c | |||
@@ -970,7 +970,7 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec, | |||
970 | break; | 970 | break; |
971 | 971 | ||
972 | case SND_SOC_BIAS_STANDBY: | 972 | case SND_SOC_BIAS_STANDBY: |
973 | if (codec->bias_level == SND_SOC_BIAS_OFF) { | 973 | if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { |
974 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies), | 974 | ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies), |
975 | wm8993->supplies); | 975 | wm8993->supplies); |
976 | if (ret != 0) | 976 | if (ret != 0) |
@@ -1045,7 +1045,7 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec, | |||
1045 | break; | 1045 | break; |
1046 | } | 1046 | } |
1047 | 1047 | ||
1048 | codec->bias_level = level; | 1048 | codec->dapm.bias_level = level; |
1049 | 1049 | ||
1050 | return 0; | 1050 | return 0; |
1051 | } | 1051 | } |
@@ -1424,6 +1424,7 @@ static struct snd_soc_dai_driver wm8993_dai = { | |||
1424 | static int wm8993_probe(struct snd_soc_codec *codec) | 1424 | static int wm8993_probe(struct snd_soc_codec *codec) |
1425 | { | 1425 | { |
1426 | struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); | 1426 | struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); |
1427 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
1427 | int ret, i, val; | 1428 | int ret, i, val; |
1428 | 1429 | ||
1429 | wm8993->hubs_data.hp_startup_mode = 1; | 1430 | wm8993->hubs_data.hp_startup_mode = 1; |
@@ -1505,11 +1506,11 @@ static int wm8993_probe(struct snd_soc_codec *codec) | |||
1505 | ARRAY_SIZE(wm8993_eq_controls)); | 1506 | ARRAY_SIZE(wm8993_eq_controls)); |
1506 | } | 1507 | } |
1507 | 1508 | ||
1508 | snd_soc_dapm_new_controls(codec, wm8993_dapm_widgets, | 1509 | snd_soc_dapm_new_controls(dapm, wm8993_dapm_widgets, |
1509 | ARRAY_SIZE(wm8993_dapm_widgets)); | 1510 | ARRAY_SIZE(wm8993_dapm_widgets)); |
1510 | wm_hubs_add_analogue_controls(codec); | 1511 | wm_hubs_add_analogue_controls(codec); |
1511 | 1512 | ||
1512 | snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes)); | 1513 | snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes)); |
1513 | wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff, | 1514 | wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff, |
1514 | wm8993->pdata.lineout2_diff); | 1515 | wm8993->pdata.lineout2_diff); |
1515 | 1516 | ||