summaryrefslogtreecommitdiffstats
path: root/drivers/slimbus
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2018-01-02 17:54:24 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-09 17:00:13 +0100
commitff595a33485567cc0f192c7f4387d0d3b36a881a (patch)
treedbea961c06cf6fd75a765f4e9fd51e5e1cb9c826 /drivers/slimbus
parentf8d2c8ea5720e22522903113100c5a16683c28be (diff)
downloadlinux-stable-ff595a33485567cc0f192c7f4387d0d3b36a881a.tar.gz
linux-stable-ff595a33485567cc0f192c7f4387d0d3b36a881a.tar.bz2
linux-stable-ff595a33485567cc0f192c7f4387d0d3b36a881a.zip
slimbus: qcom: Fix return value check in qcom_slim_probe()
In case of error, the function devm_ioremap_resource() 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 <weiyongjun1@huawei.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/slimbus')
-rw-r--r--drivers/slimbus/qcom-ctrl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c
index 8d12baae4119..ffb46f915334 100644
--- a/drivers/slimbus/qcom-ctrl.c
+++ b/drivers/slimbus/qcom-ctrl.c
@@ -529,9 +529,9 @@ static int qcom_slim_probe(struct platform_device *pdev)
slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem);
- if (!ctrl->base) {
+ if (IS_ERR(ctrl->base)) {
dev_err(&pdev->dev, "IOremap failed\n");
- return -ENOMEM;
+ return PTR_ERR(ctrl->base);
}
sctrl->set_laddr = qcom_set_laddr;