diff options
author | Wei Yongjun <weiyongjun1@huawei.com> | 2018-01-02 12:54:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-09 11:00:13 -0500 |
commit | ff595a33485567cc0f192c7f4387d0d3b36a881a (patch) | |
tree | dbea961c06cf6fd75a765f4e9fd51e5e1cb9c826 /drivers/slimbus | |
parent | f8d2c8ea5720e22522903113100c5a16683c28be (diff) |
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.c | 4 |
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) | |||
529 | 529 | ||
530 | slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); | 530 | slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); |
531 | ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem); | 531 | ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem); |
532 | if (!ctrl->base) { | 532 | if (IS_ERR(ctrl->base)) { |
533 | dev_err(&pdev->dev, "IOremap failed\n"); | 533 | dev_err(&pdev->dev, "IOremap failed\n"); |
534 | return -ENOMEM; | 534 | return PTR_ERR(ctrl->base); |
535 | } | 535 | } |
536 | 536 | ||
537 | sctrl->set_laddr = qcom_set_laddr; | 537 | sctrl->set_laddr = qcom_set_laddr; |