diff options
| author | Mark Brown <broonie@kernel.org> | 2021-03-12 22:54:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-03-12 22:54:33 +0000 |
| commit | 6e35f4281caeeb4a6fd244e57322c1e07a1cc385 (patch) | |
| tree | 9672d332806790c82e4bc0fc9fe3d49621627101 | |
| parent | ee427ea4f12672e5d7874abaa634ddee0ff2bb97 (diff) | |
| parent | f7b61287cf17486dd09438115a993d699db2ab3b (diff) | |
Merge series "ASoC: samsung: remove cppcheck warnings" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
v4:
corrected Fixes tag
Added added Krzysztof Kozlowski's r-v-b tag
reverted patch2 to v2 since this is the agreement.
v3:
Added Sylwester tag
Rebased and squashed fix with initial patch which was merged at some
point but can't be found in broonie/for-next (not sure what happened?)
Corrected patch subjects to tm2_wm5110
Reverted second patch to initial v1, after agreement between Krzysztof
and Sylwester
v2:
added Krzysztof Kozlowski's tags
added fix for first patch already merged as suggested by Krzysztof Kozlowski
moved variable to lower scope in patch6
Pierre-Louis Bossart (2):
ASoC: samsung: tm2_wm5110: check of of_parse return value
ASoC: samsung: tm2_wm5110: remove shadowed variable
sound/soc/samsung/tm2_wm5110.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
2.25.1
| -rw-r--r-- | sound/soc/samsung/tm2_wm5110.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 9300fef9bf26..84c2c63d5a87 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -501,7 +501,6 @@ static int tm2_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct snd_soc_card *card = &tm2_card; struct tm2_machine_priv *priv; - struct of_phandle_args args; struct snd_soc_dai_link *dai_link; int num_codecs, ret, i; @@ -553,7 +552,7 @@ static int tm2_probe(struct platform_device *pdev) ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller", cells_name, i, &args); - if (!args.np) { + if (ret) { dev_err(dev, "i2s-controller property parse error: %d\n", i); ret = -EINVAL; goto dai_node_put; @@ -585,6 +584,8 @@ static int tm2_probe(struct platform_device *pdev) } if (num_codecs > 1) { + struct of_phandle_args args; + /* HDMI DAI link (I2S1) */ i = card->num_links - 1; |