summaryrefslogtreecommitdiff
path: root/sound/soc/mediatek/mt2701
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-01-08 02:15:01 +0000
committerMark Brown <broonie@kernel.org>2018-01-08 11:27:45 +0000
commit3e8052d90d24320a1edb556c20523f3b17195985 (patch)
tree467abeb4e93ae04d75fef6dab0f153788ceea794 /sound/soc/mediatek/mt2701
parent7f12a56367bf526afde7e81820a8c7d97e75ed10 (diff)
ASoC: mediatek: mt2701: fix return value check in mt2701_afe_pcm_dev_probe()
In case of error, the function syscon_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: dfa3cbb83e09 ("ASoC: mediatek: modify MT2701 AFE driver to adapt mfd device") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/mediatek/mt2701')
-rw-r--r--sound/soc/mediatek/mt2701/mt2701-afe-pcm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index f0cd08fa5c5d..5bc4e00a4a29 100644
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -1440,9 +1440,9 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
}
afe->regmap = syscon_node_to_regmap(dev->parent->of_node);
- if (!afe->regmap) {
+ if (IS_ERR(afe->regmap)) {
dev_err(dev, "could not get regmap from parent\n");
- return -ENODEV;
+ return PTR_ERR(afe->regmap);
}
mutex_init(&afe->irq_alloc_lock);