xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next

Bläddra i källkod
This commit is contained in:
Mark Brown
2015-06-05 18:54:45 +01:00
förälder 2914b7004b cc76e7def0
incheckning 4b57895522
111 ändrade filer med 685 tillägg och 475 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/wm5110.c
Visa fil

@@ -1598,10 +1598,11 @@ static struct snd_soc_dai_driver wm5110_dai[] = {
static int wm5110_codec_probe(struct snd_soc_codec *codec)
{
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
int ret;
priv->core.arizona->dapm = &codec->dapm;
priv->core.arizona->dapm = dapm;
arizona_init_spk(codec);
arizona_init_gpio(codec);
@@ -1611,9 +1612,7 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
if (ret != 0)
return ret;
snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
priv->core.arizona->dapm = &codec->dapm;
snd_soc_dapm_disable_pin(dapm, "HAPTICS");
return 0;
}