aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2019-01-03 07:02:30 +0000
committerBjorn Andersson <bjorn.andersson@linaro.org>2019-01-03 11:42:10 -0800
commit4d5a91fd1f42a821d14b92b082b8e71be9911ba5 (patch)
tree20bfe3f3c3017fa2464838a375378e81815fc3bf /drivers
parentf24fcff1d267da08c4bbb3869e7f4b36ce916b76 (diff)
downloadlinux-stericsson-4d5a91fd1f42a821d14b92b082b8e71be9911ba5.tar.gz
hwspinlock: fix return value check in stm32_hwspinlock_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(). Fixes: f24fcff1d267 ("hwspinlock: add STM32 hwspinlock device") Acked-by: Benjamin Gaignard <benjamin.gaignard@gmail.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwspinlock/stm32_hwspinlock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c
index 34a8e009dc93..441839288893 100644
--- a/drivers/hwspinlock/stm32_hwspinlock.c
+++ b/drivers/hwspinlock/stm32_hwspinlock.c
@@ -57,8 +57,8 @@ static int stm32_hwspinlock_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
io_base = devm_ioremap_resource(&pdev->dev, res);
- if (!io_base)
- return -ENOMEM;
+ if (IS_ERR(io_base))
+ return PTR_ERR(io_base);
array_size = STM32_MUTEX_NUM_LOCKS * sizeof(struct hwspinlock);
hw = devm_kzalloc(&pdev->dev, sizeof(*hw) + array_size, GFP_KERNEL);