projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
UPSTREAM: iommu/rockchip: Don't feed NULL res pointers to devres
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iommu
/
rockchip-iommu.c
diff --git
a/drivers/iommu/rockchip-iommu.c
b/drivers/iommu/rockchip-iommu.c
index 650c7e42afe85d005c139df3399167edb08ad4cd..ce1ed0deb384e429343dd97702c33bc526c93b39 100644
(file)
--- a/
drivers/iommu/rockchip-iommu.c
+++ b/
drivers/iommu/rockchip-iommu.c
@@
-1141,6
+1141,8
@@
static int rk_iommu_probe(struct platform_device *pdev)
for (i = 0; i < num_res; i++) {
res = platform_get_resource(pdev, IORESOURCE_MEM, i);
+ if (!res)
+ continue;
iommu->bases[i] = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(iommu->bases[i]))
continue;