Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1031f7f0 authored by Gopikrishnaiah Anandan's avatar Gopikrishnaiah Anandan Committed by Stephen Boyd
Browse files

ASoC: msm8x10: Upgrade to kernel 3.10 ASoC 



ASoC frame work in 3.10 kernel defers the machine driver
probe if all required modules for sound card installation
is not initialized.

Signed-off-by: default avatarGopikrishnaiah Anandan <agopik@codeaurora.org>
parent 1bb82524

sound/soc/msm/msm8x10.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -917,13 +917,13 @@ static int msm8x10_asoc_machine_probe(struct platform_device *pdev) 
	prcgr = ioremap(MSM8X10_DINO_LPASS_DIGCODEC_CMD_RCGR, 4);

	prcgr = ioremap(MSM8X10_DINO_LPASS_DIGCODEC_CMD_RCGR, 4);





	spdev = pdev;

	spdev = pdev;

	mutex_init(&cdc_mclk_mutex);

	ret = snd_soc_register_card(card);

	ret = snd_soc_register_card(card);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",

			ret);

			ret);

		goto err;

		goto err;

	}

	}

	mutex_init(&cdc_mclk_mutex);

	atomic_set(&mclk_rsc_ref, 0);

	atomic_set(&mclk_rsc_ref, 0);

	return 0;

	return 0;

err:

err: