summaryrefslogtreecommitdiffstats
path: root/sound/soc/sti
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-06-13 14:39:57 +0000
committerMark Brown <broonie@kernel.org>2016-06-13 16:37:19 +0100
commit7d267ddfd560da3232f4deed3427839dd0126a4a (patch)
treea8a08bcae096b82d1c3b5b4dce48a8e7bf65930e /sound/soc/sti
parent05c1b4480e86a871b18030d6f3d532dc0ecdf38c (diff)
downloadlinux-7d267ddfd560da3232f4deed3427839dd0126a4a.tar.gz
linux-7d267ddfd560da3232f4deed3427839dd0126a4a.tar.bz2
linux-7d267ddfd560da3232f4deed3427839dd0126a4a.zip
ASoC: sti: fix return value check in uni_player_parse_dt_audio_glue()
In case of error, the function syscon_regmap_lookup_by_phandle() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sti')
-rw-r--r--sound/soc/sti/uniperif_player.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sti/uniperif_player.c b/sound/soc/sti/uniperif_player.c
index ee1c7c245bc7..1ac2db205a0d 100644
--- a/sound/soc/sti/uniperif_player.c
+++ b/sound/soc/sti/uniperif_player.c
@@ -1029,9 +1029,9 @@ static int uni_player_parse_dt_audio_glue(struct platform_device *pdev,
regmap = syscon_regmap_lookup_by_phandle(node, "st,syscfg");
- if (!regmap) {
+ if (IS_ERR(regmap)) {
dev_err(&pdev->dev, "sti-audio-clk-glue syscf not found\n");
- return -EINVAL;
+ return PTR_ERR(regmap);
}
player->clk_sel = regmap_field_alloc(regmap, regfield[0]);