projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-amd-pmu-fixes' into HEAD
[linux-2.6-microblaze.git]
/
drivers
/
iommu
/
omap-iommu.c
diff --git
a/drivers/iommu/omap-iommu.c
b/drivers/iommu/omap-iommu.c
index
4aab631
..
d9cf282
100644
(file)
--- a/
drivers/iommu/omap-iommu.c
+++ b/
drivers/iommu/omap-iommu.c
@@
-1661,7
+1661,7
@@
static struct iommu_device *omap_iommu_probe_device(struct device *dev)
num_iommus = of_property_count_elems_of_size(dev->of_node, "iommus",
sizeof(phandle));
if (num_iommus < 0)
- return
0
;
+ return
ERR_PTR(-ENODEV)
;
arch_data = kcalloc(num_iommus + 1, sizeof(*arch_data), GFP_KERNEL);
if (!arch_data)