Merge "ASoC: msmcobalt: fix wrong platform device pointer assignment" (d7a40572) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/msmcobalt.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3971,8 +3971,6 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
		goto err;
		}

		spdev = pdev;

		ret = msm_populate_dai_link_component_of_node(card);
		if (ret) {
		ret = -EPROBE_DEFER;
		@@ -4010,6 +4008,7 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
		goto err;
		}
		dev_info(&pdev->dev, "Sound card %s registered\n", card->name);
		spdev = pdev;

		ret = of_property_read_string(pdev->dev.of_node,
		"qcom,mbhc-audio-jack-type", &mbhc_audio_jack_type);