| Message ID | 20210326215927.936377-9-pierre-louis.bossart@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | bf2a6b44d5e56a12dde6438a2d092475e54d1923 |
| Headers | show |
| Series | ASoC: remove cppcheck warnings for multiple SOCs | expand |
> -----Original Message----- > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Sent: vendredi 26 mars 2021 22:59 > To: alsa-devel@alsa-project.org > Cc: tiwai@suse.de; broonie@kernel.org; linux-kernel@vger.kernel.org; Pierre- > Louis Bossart <pierre-louis.bossart@linux.intel.com>; Arnaud POULIQUEN > <arnaud.pouliquen@st.com>; Liam Girdwood <lgirdwood@gmail.com>; > Jaroslav Kysela <perex@perex.cz>; Takashi Iwai <tiwai@suse.com> > Subject: [PATCH 08/17] ASoC: sti: sti_uniperif: add missing error check > > cppcheck warning: > > sound/soc/sti/sti_uniperif.c:490:6: style: Variable 'ret' is reassigned a value > before the old one has been used. [redundantAssignment] ret = > devm_snd_soc_register_component(&pdev->dev, > ^ > sound/soc/sti/sti_uniperif.c:486:6: note: ret is assigned ret = > sti_uniperiph_cpu_dai_of(node, priv); > ^ > sound/soc/sti/sti_uniperif.c:490:6: note: ret is overwritten ret = > devm_snd_soc_register_component(&pdev->dev, > ^ > > sti_uniperiph_cpu_dai_of() can return -EINVAL which seems like a good-enough > reason to bail. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Thanks Arnaud > --- > sound/soc/sti/sti_uniperif.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c index > 7b9169f04d6e..67315d9b352d 100644 > --- a/sound/soc/sti/sti_uniperif.c > +++ b/sound/soc/sti/sti_uniperif.c > @@ -484,6 +484,8 @@ static int sti_uniperiph_probe(struct platform_device > *pdev) > priv->pdev = pdev; > > ret = sti_uniperiph_cpu_dai_of(node, priv); > + if (ret < 0) > + return ret; > > dev_set_drvdata(&pdev->dev, priv); > > -- > 2.25.1
diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c index 7b9169f04d6e..67315d9b352d 100644 --- a/sound/soc/sti/sti_uniperif.c +++ b/sound/soc/sti/sti_uniperif.c @@ -484,6 +484,8 @@ static int sti_uniperiph_probe(struct platform_device *pdev) priv->pdev = pdev; ret = sti_uniperiph_cpu_dai_of(node, priv); + if (ret < 0) + return ret; dev_set_drvdata(&pdev->dev, priv);
cppcheck warning: sound/soc/sti/sti_uniperif.c:490:6: style: Variable 'ret' is reassigned a value before the old one has been used. [redundantAssignment] ret = devm_snd_soc_register_component(&pdev->dev, ^ sound/soc/sti/sti_uniperif.c:486:6: note: ret is assigned ret = sti_uniperiph_cpu_dai_of(node, priv); ^ sound/soc/sti/sti_uniperif.c:490:6: note: ret is overwritten ret = devm_snd_soc_register_component(&pdev->dev, ^ sti_uniperiph_cpu_dai_of() can return -EINVAL which seems like a good-enough reason to bail. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- sound/soc/sti/sti_uniperif.c | 2 ++ 1 file changed, 2 insertions(+)