diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-31 21:36:45 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-31 21:36:45 -0700 |
| commit | eed72db02a2a1005acc30a2ed81ceeab3f2a4b3f (patch) | |
| tree | a92f55f71bcfe148f36aeccb270893f65e5c8cad | |
| parent | 1c1be8be7323abd2e8a7b6935020501d90725409 (diff) | |
| parent | b7cc9e62cc56a13607242acb0601c9d12c0df46e (diff) | |
Merge "ASoC: audio-ext-clk: check for null pointer de-reference"
| -rwxr-xr-x | sound/soc/codecs/audio-ext-clk.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/audio-ext-clk.c b/sound/soc/codecs/audio-ext-clk.c index 7faabcfb1db1..c422267dbf2c 100755 --- a/sound/soc/codecs/audio-ext-clk.c +++ b/sound/soc/codecs/audio-ext-clk.c @@ -91,6 +91,10 @@ static int audio_ext_clk2_prepare(struct clk *clk) struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info; int ret; + + if (!pnctrl_info->pinctrl || !pnctrl_info->active) + return 0; + ret = pinctrl_select_state(pnctrl_info->pinctrl, pnctrl_info->active); if (ret) { @@ -115,6 +119,9 @@ static void audio_ext_clk2_unprepare(struct clk *clk) struct pinctrl_info *pnctrl_info = &audio_clk2->pnctrl_info; int ret; + if (!pnctrl_info->pinctrl || !pnctrl_info->sleep) + return; + ret = pinctrl_select_state(pnctrl_info->pinctrl, pnctrl_info->sleep); if (ret) |