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

Commit 6c104f8d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: audio-ext-clk: avoid multiple initialization of pinctrl_info"

parents a9773650 35b034ff

sound/soc/codecs/audio-ext-clk.c

100755 → 100644
+7 −1
Original line number Diff line number Diff line
@@ -193,7 +193,13 @@ static int audio_get_pinctrl(struct platform_device *pdev) 
	int ret;



	pnctrl_info = &audio_ap_clk2.pnctrl_info;

	pnctrl_info->pinctrl = NULL;



	if (pnctrl_info->pinctrl) {

		dev_dbg(&pdev->dev, "%s: already requested before\n",

			__func__);

		return -EINVAL;

	}



	pinctrl = devm_pinctrl_get(&pdev->dev);

	if (IS_ERR_OR_NULL(pinctrl)) {

		dev_dbg(&pdev->dev, "%s: Unable to get pinctrl handle\n",