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

Commit 55752e98 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: Fixed wsa881x codec machine driver callback"

parents 37af3b8b 0ba1e602

asoc/codecs/sdm660_cdc/msm-digital-cdc-legacy.c

+8 −1
Original line number Diff line number Diff line
@@ -2369,6 +2369,7 @@ static int msm_dig_cdc_resume(struct snd_soc_component *component) 
}



const struct snd_soc_component_driver soc_msm_dig_codec = {

	.name = DRV_NAME,

	.probe  = msm_dig_cdc_soc_probe,

	.remove = msm_dig_cdc_soc_remove,

	.suspend = msm_dig_cdc_suspend,
@@ -2543,8 +2544,14 @@ static int msm_dig_cdc_probe(struct platform_device *pdev) 




	dev_set_drvdata(&pdev->dev, msm_dig_cdc);

	snd_soc_register_component(&pdev->dev, &soc_msm_dig_codec,

	ret = snd_soc_register_component(&pdev->dev, &soc_msm_dig_codec,

				msm_codec_dais, ARRAY_SIZE(msm_codec_dais));

	if (ret) {

		dev_err(&pdev->dev,

			"%s:snd_soc_register_component failed with error %d\n",

			__func__, ret);

		goto err_supplies;

	}

	dev_dbg(&pdev->dev, "%s: registered DIG CODEC 0x%x\n",

			__func__, dig_cdc_addr);

	return ret;

asoc/msm8952.c

+0 −1
Original line number Diff line number Diff line
@@ -3393,7 +3393,6 @@ static int msm8952_asoc_machine_probe(struct platform_device *pdev) 
						__func__, ret);

				goto err;

			}

			wsa881x_set_mclk_callback(msm8952_enable_wsa_mclk);

			/* update the internal speaker boost usage */

			msm_anlg_cdc_update_int_spk_boost(false);

		}