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

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

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-15 22:51:56 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6c104f8d40
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sound/soc/codecs/audio-ext-clk.c Executable file → Normal file
View file

@ -193,7 +193,13 @@ static int audio_get_pinctrl(struct platform_device *pdev)
int ret; int ret;
pnctrl_info = &audio_ap_clk2.pnctrl_info; 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); pinctrl = devm_pinctrl_get(&pdev->dev);
if (IS_ERR_OR_NULL(pinctrl)) { if (IS_ERR_OR_NULL(pinctrl)) {
dev_dbg(&pdev->dev, "%s: Unable to get pinctrl handle\n", dev_dbg(&pdev->dev, "%s: Unable to get pinctrl handle\n",