ASoC: sti: fix return value check in uni_player_parse_dt_audio_glue()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Mon, 13 Jun 2016 14:39:57 +0000 (14:39 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 13 Jun 2016 15:37:19 +0000 (16:37 +0100)
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>
sound/soc/sti/uniperif_player.c

index ee1c7c2..1ac2db2 100644 (file)
@@ -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]);