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

Merge "ASoC: audio-ext-clk: check for null pointer de-reference"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-31 21:36:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit eed72db02a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/soc/codecs/audio-ext-clk.c
View file

@ -91,6 +91,10 @@ static int audio_ext_clk2_prepare(struct clk *clk)
struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info; struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info;
int ret; int ret;
if (!pnctrl_info->pinctrl || !pnctrl_info->active)
return 0;
ret = pinctrl_select_state(pnctrl_info->pinctrl, ret = pinctrl_select_state(pnctrl_info->pinctrl,
pnctrl_info->active); pnctrl_info->active);
if (ret) { if (ret) {
@ -115,6 +119,9 @@ static void audio_ext_clk2_unprepare(struct clk *clk)
struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info; struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info;
int ret; int ret;
if (!pnctrl_info->pinctrl || !pnctrl_info->sleep)
return;
ret = pinctrl_select_state(pnctrl_info->pinctrl, ret = pinctrl_select_state(pnctrl_info->pinctrl,
pnctrl_info->sleep); pnctrl_info->sleep);
if (ret) if (ret)