OSDN Git Service

ASoC: rt711: fix return value check in rt711_sdw_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 15 Jan 2020 14:30:34 +0000 (14:30 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 17 Jan 2020 15:31:07 +0000 (15:31 +0000)
In case of error, the function devm_regmap_init() returns ERR_PTR() and
never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR().

Fixes: 320b8b0d13b8 ("ASoC: rt711: add rt711 codec driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200115143034.94492-1-weiyongjun1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt711-sdw.c

index e28dc84..85e62e1 100644 (file)
@@ -460,8 +460,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave,
 
        regmap = devm_regmap_init(&slave->dev, NULL,
                &slave->dev, &rt711_regmap);
-       if (!regmap)
-               return -EINVAL;
+       if (IS_ERR(regmap))
+               return PTR_ERR(regmap);
 
        rt711_init(&slave->dev, sdw_regmap, regmap, slave);