|
@@ -721,6 +721,7 @@ static int configure_aif_clock(struct snd_soc_codec *codec, int aif)
|
|
|
|
|
|
static int configure_clock(struct snd_soc_codec *codec)
|
|
static int configure_clock(struct snd_soc_codec *codec)
|
|
{
|
|
{
|
|
|
|
+ struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
|
|
struct wm8995_priv *wm8995;
|
|
struct wm8995_priv *wm8995;
|
|
int change, new;
|
|
int change, new;
|
|
|
|
|
|
@@ -751,7 +752,7 @@ static int configure_clock(struct snd_soc_codec *codec)
|
|
if (!change)
|
|
if (!change)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- snd_soc_dapm_sync(&codec->dapm);
|
|
|
|
|
|
+ snd_soc_dapm_sync(dapm);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -1965,7 +1966,7 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec,
|
|
case SND_SOC_BIAS_PREPARE:
|
|
case SND_SOC_BIAS_PREPARE:
|
|
break;
|
|
break;
|
|
case SND_SOC_BIAS_STANDBY:
|
|
case SND_SOC_BIAS_STANDBY:
|
|
- if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
|
|
|
|
|
|
+ if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
|
|
ret = regulator_bulk_enable(ARRAY_SIZE(wm8995->supplies),
|
|
ret = regulator_bulk_enable(ARRAY_SIZE(wm8995->supplies),
|
|
wm8995->supplies);
|
|
wm8995->supplies);
|
|
if (ret)
|
|
if (ret)
|