diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-11-19 06:15:31 -0500 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-12-01 11:50:41 -0500 |
commit | 461bfb3fe7d0cf64d9ee2190ad8507e460fab198 (patch) | |
tree | 3b9a0f9bd372b502fc7b03bcd9fa1959abda2b32 /drivers/iommu | |
parent | 7eba1d51485197fa77c43c42eae3ce04b4b1c1c0 (diff) |
iommu: fix initialization without 'add_device' callback
IOMMU drivers can be initialized from of_iommu helpers. Such drivers don't
need to provide device_add callbacks to operate properly, so there is no
need to fail initialization if the callback is missing.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index ed8b04867b1f..02f798b7e295 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c | |||
@@ -737,7 +737,7 @@ static int add_iommu_group(struct device *dev, void *data) | |||
737 | const struct iommu_ops *ops = cb->ops; | 737 | const struct iommu_ops *ops = cb->ops; |
738 | 738 | ||
739 | if (!ops->add_device) | 739 | if (!ops->add_device) |
740 | return -ENODEV; | 740 | return 0; |
741 | 741 | ||
742 | WARN_ON(dev->iommu_group); | 742 | WARN_ON(dev->iommu_group); |
743 | 743 | ||