xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

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

Telusuri Sumber
This commit is contained in:
Mark Brown
2015-06-05 18:54:45 +01:00
orang tua 2914b7004b cc76e7def0
melakukan 4b57895522
111 mengubah file dengan 685 tambahan dan 475 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/wm5102.c
Melihat File

@@ -1827,6 +1827,7 @@ static struct snd_soc_dai_driver wm5102_dai[] = {
static int wm5102_codec_probe(struct snd_soc_codec *codec)
{
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
int ret;
@@ -1837,9 +1838,9 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
arizona_init_spk(codec);
arizona_init_gpio(codec);
snd_soc_dapm_disable_pin(&codec->dapm, "HAPTICS");
snd_soc_dapm_disable_pin(dapm, "HAPTICS");
priv->core.arizona->dapm = &codec->dapm;
priv->core.arizona->dapm = dapm;
return 0;
}