| Message ID | 20230705123018.30903-4-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ed0dd9205bf69593edb495cb4b086dbae96a3f05 |
| Headers | show |
| Series | ASoC/soundwire/qdsp6/wcd: fix leaks and probe deferral | expand |
On 05/07/2023 13:30, Johan Hovold wrote: > Allocation of the clash control structure may fail so add the missing > error handling to avoid dereferencing an error pointer. > > Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver") > Cc: stable@vger.kernel.org # 5.14 > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > sound/soc/codecs/wcd938x.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index faa15a5ed2c8..2e342398d027 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -3106,6 +3106,10 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) > WCD938X_ID_MASK); > > wcd938x->clsh_info = wcd_clsh_ctrl_alloc(component, WCD938X); > + if (IS_ERR(wcd938x->clsh_info)) { > + pm_runtime_put(dev); > + return PTR_ERR(wcd938x->clsh_info); > + } > > wcd938x_io_init(wcd938x); > /* Set all interrupts as edge triggered */
diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index faa15a5ed2c8..2e342398d027 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3106,6 +3106,10 @@ static int wcd938x_soc_codec_probe(struct snd_soc_component *component) WCD938X_ID_MASK); wcd938x->clsh_info = wcd_clsh_ctrl_alloc(component, WCD938X); + if (IS_ERR(wcd938x->clsh_info)) { + pm_runtime_put(dev); + return PTR_ERR(wcd938x->clsh_info); + } wcd938x_io_init(wcd938x); /* Set all interrupts as edge triggered */
Allocation of the clash control structure may fail so add the missing error handling to avoid dereferencing an error pointer. Fixes: 8d78602aa87a ("ASoC: codecs: wcd938x: add basic driver") Cc: stable@vger.kernel.org # 5.14 Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- sound/soc/codecs/wcd938x.c | 4 ++++ 1 file changed, 4 insertions(+)