| Message ID | 20200519091857.134170-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ae7d292324b4be60b6d39d2e06bf2a63752f3fcd |
| Headers | show |
| Series | [-next] iommu/sun50i: Fix return value check in sun50i_iommu_probe() | expand |
On Tue, May 19, 2020 at 09:18:57AM +0000, Wei Yongjun wrote: > In case of error, the function devm_platform_ioremap_resource() returns > ERR_PTR() not NULL. The NULL test in the return value check must be > replaced with IS_ERR(). > > Fixes: 4100b8c229b3 ("iommu: Add Allwinner H6 IOMMU driver") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Maxime Ripard <mripard@kernel.org> Thanks! Maxime
On Tue, May 19, 2020 at 09:18:57AM +0000, Wei Yongjun wrote: > In case of error, the function devm_platform_ioremap_resource() returns > ERR_PTR() not NULL. The NULL test in the return value check must be > replaced with IS_ERR(). > > Fixes: 4100b8c229b3 ("iommu: Add Allwinner H6 IOMMU driver") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/iommu/sun50i-iommu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks.
diff --git a/drivers/iommu/sun50i-iommu.c b/drivers/iommu/sun50i-iommu.c index 9c763d4a8e2a..1fa09ddcebd4 100644 --- a/drivers/iommu/sun50i-iommu.c +++ b/drivers/iommu/sun50i-iommu.c @@ -941,7 +941,7 @@ static int sun50i_iommu_probe(struct platform_device *pdev) } iommu->base = devm_platform_ioremap_resource(pdev, 0); - if (!iommu->base) { + if (IS_ERR(iommu->base)) { ret = PTR_ERR(iommu->base); goto err_free_group; }
In case of error, the function devm_platform_ioremap_resource() returns ERR_PTR() not NULL. The NULL test in the return value check must be replaced with IS_ERR(). Fixes: 4100b8c229b3 ("iommu: Add Allwinner H6 IOMMU driver") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/iommu/sun50i-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)