diff options
| author | Viorel Suman <viorel.suman@nxp.com> | 2018-03-09 12:41:42 +0200 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:58 +0800 |
| commit | cf1d61356c37509f058f532de6e9332a617e47eb (patch) | |
| tree | 64d74d310ba66c572223033e1faa65d41c390773 /sound/soc/fsl/fsl_sai.c | |
| parent | 0e084ed83d0ce76f0a0ca087e2c790ab4e59d3c4 (diff) | |
MLK-17580: ASoC: fsl: sai: check for pinctrl status
For some cases (like AMIX) pinctrl may be null - this
breaks SAI functionality. Enforce pinctrl null pointer
checking prior calling any function which involves
pins state changes.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Diffstat (limited to 'sound/soc/fsl/fsl_sai.c')
| -rw-r--r-- | sound/soc/fsl/fsl_sai.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5c657bde67f2..28ea420e6e1d 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -530,14 +530,17 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, pins = DIV_ROUND_UP(channels, slots); sai->is_dsd = fsl_is_dsd(params); - sai->pins_state = fsl_get_pins_state(sai->pinctrl, params); - if (!IS_ERR_OR_NULL(sai->pins_state)) { - ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); - if (ret) { - dev_err(cpu_dai->dev, - "failed to set proper pins state: %d\n", ret); - return ret; + if (!IS_ERR_OR_NULL(sai->pinctrl)) { + sai->pins_state = fsl_get_pins_state(sai->pinctrl, params); + + if (!IS_ERR_OR_NULL(sai->pins_state)) { + ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); + if (ret) { + dev_err(cpu_dai->dev, + "failed to set proper pins state: %d\n", ret); + return ret; + } } } @@ -920,7 +923,7 @@ static int fsl_sai_dai_resume(struct snd_soc_dai *cpu_dai) struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); int ret; - if (!IS_ERR_OR_NULL(sai->pins_state)) { + if (!IS_ERR_OR_NULL(sai->pinctrl) && !IS_ERR_OR_NULL(sai->pins_state)) { ret = pinctrl_select_state(sai->pinctrl, sai->pins_state); if (ret) { dev_err(cpu_dai->dev, @@ -1345,7 +1348,7 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX; sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; - sai->pinctrl = devm_pinctrl_get(&pdev->dev); + sai->pinctrl = devm_pinctrl_get(&pdev->dev); platform_set_drvdata(pdev, sai); |