evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: msmcobalt: fix wrong platform device pointer assignment"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-13 04:51:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit d7a4057219
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/soc/msm/msmcobalt.c
View file

@ -3971,8 +3971,6 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
goto err; goto err;
} }
spdev = pdev;
ret = msm_populate_dai_link_component_of_node(card); ret = msm_populate_dai_link_component_of_node(card);
if (ret) { if (ret) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
@ -4010,6 +4008,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
goto err; goto err;
} }
dev_info(&pdev->dev, "Sound card %s registered\n", card->name); dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
spdev = pdev;
ret = of_property_read_string(pdev->dev.of_node, ret = of_property_read_string(pdev->dev.of_node,
"qcom,mbhc-audio-jack-type", &mbhc_audio_jack_type); "qcom,mbhc-audio-jack-type", &mbhc_audio_jack_type);