* [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init
@ 2016-11-22 14:46 Charles Keepax
2016-11-22 15:22 ` Takashi Sakamoto
0 siblings, 1 reply; 3+ messages in thread
From: Charles Keepax @ 2016-11-22 14:46 UTC (permalink / raw)
To: broonie; +Cc: alsa-devel, patches, lgirdwood
We are not checking the return value from a call to wm_adsp_buffer_init
it looks like this used to be returned at the bottom of the function but
probably got missed when more error paths were added. This patch adds
the appropriate error check.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm_adsp.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 6ccb731..7e4f8dd 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2580,8 +2580,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
mutex_lock(&dsp->pwr_lock);
- if (wm_adsp_fw[dsp->fw].num_caps != 0)
+ if (wm_adsp_fw[dsp->fw].num_caps != 0) {
ret = wm_adsp_buffer_init(dsp);
+ if (ret < 0)
+ goto err;
+ }
mutex_unlock(&dsp->pwr_lock);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init
2016-11-22 14:46 [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init Charles Keepax
@ 2016-11-22 15:22 ` Takashi Sakamoto
2016-11-22 15:28 ` Charles Keepax
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Sakamoto @ 2016-11-22 15:22 UTC (permalink / raw)
To: Charles Keepax, broonie; +Cc: alsa-devel, patches, lgirdwood
Charles,
On Nov 22 2016 16:46, Charles Keepax wrote:
> We are not checking the return value from a call to wm_adsp_buffer_init
> it looks like this used to be returned at the bottom of the function but
> probably got missed when more error paths were added. This patch adds
> the appropriate error check.
>
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/wm_adsp.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
> index 6ccb731..7e4f8dd 100644
> --- a/sound/soc/codecs/wm_adsp.c
> +++ b/sound/soc/codecs/wm_adsp.c
> @@ -2580,8 +2580,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
>
> mutex_lock(&dsp->pwr_lock);
>
> - if (wm_adsp_fw[dsp->fw].num_caps != 0)
> + if (wm_adsp_fw[dsp->fw].num_caps != 0) {
> ret = wm_adsp_buffer_init(dsp);
> + if (ret < 0)
> + goto err;
> + }
Need to call mutex_unlock() before jumping to err label?
>
> mutex_unlock(&dsp->pwr_lock);
Regards
Takashi Sakamoto
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init
2016-11-22 15:22 ` Takashi Sakamoto
@ 2016-11-22 15:28 ` Charles Keepax
0 siblings, 0 replies; 3+ messages in thread
From: Charles Keepax @ 2016-11-22 15:28 UTC (permalink / raw)
To: Takashi Sakamoto; +Cc: alsa-devel, broonie, patches, lgirdwood
On Tue, Nov 22, 2016 at 05:22:17PM +0200, Takashi Sakamoto wrote:
> Charles,
>
> On Nov 22 2016 16:46, Charles Keepax wrote:
> > We are not checking the return value from a call to wm_adsp_buffer_init
> > it looks like this used to be returned at the bottom of the function but
> > probably got missed when more error paths were added. This patch adds
> > the appropriate error check.
> >
> > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> > ---
> > sound/soc/codecs/wm_adsp.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
> > index 6ccb731..7e4f8dd 100644
> > --- a/sound/soc/codecs/wm_adsp.c
> > +++ b/sound/soc/codecs/wm_adsp.c
> > @@ -2580,8 +2580,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
> >
> > mutex_lock(&dsp->pwr_lock);
> >
> > - if (wm_adsp_fw[dsp->fw].num_caps != 0)
> > + if (wm_adsp_fw[dsp->fw].num_caps != 0) {
> > ret = wm_adsp_buffer_init(dsp);
> > + if (ret < 0)
> > + goto err;
> > + }
>
> Need to call mutex_unlock() before jumping to err label?
>
Thanks, will respin.
Thanks,
Charles
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-22 15:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-22 14:46 [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init Charles Keepax
2016-11-22 15:22 ` Takashi Sakamoto
2016-11-22 15:28 ` Charles Keepax
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).