Skip to content

Commit 02994fd

Browse files
committed
Merge tag 'iommu-fix-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fix from Joerg Roedel: - Fix boot regression due to a NULL-ptr dereference on OMAP machines * tag 'iommu-fix-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/omap: Fix regression in probe for NULL pointer dereference
2 parents 1831fed + 71ff461 commit 02994fd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/iommu/omap-iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev)
16611661
num_iommus = of_property_count_elems_of_size(dev->of_node, "iommus",
16621662
sizeof(phandle));
16631663
if (num_iommus < 0)
1664-
return 0;
1664+
return ERR_PTR(-ENODEV);
16651665

16661666
arch_data = kcalloc(num_iommus + 1, sizeof(*arch_data), GFP_KERNEL);
16671667
if (!arch_data)

0 commit comments

Comments
 (0)