| Message ID | 1383217687-12037-4-git-send-email-tushar.behera@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 31, 2013 at 11:08:05AM +0000, Tushar Behera wrote:
> While at it, propagate the error code.
Thanks, but I already have an equivalent patch queued which Joerg is going
to pull real soon now (right, Joerg? :p).
Will
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 2349d62..fe275b3 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1790,9 +1790,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) } smmu->size = resource_size(res); - smmu->base = devm_request_and_ioremap(dev, res); - if (!smmu->base) - return -EADDRNOTAVAIL; + smmu->base = devm_ioremap_resource(dev, res); + if (IS_ERR(smmu->base)) + return PTR_ERR(smmu->base); if (of_property_read_u32(dev->of_node, "#global-interrupts", &smmu->num_global_irqs)) {
While at it, propagate the error code. Signed-off-by: Tushar Behera <tushar.behera@linaro.org> CC: linux-arm-kernel@lists.infradead.org CC: iommu@lists.linux-foundation.org CC: Will Deacon <will.deacon@arm.com> CC: Joerg Roedel <joro@8bytes.org> --- drivers/iommu/arm-smmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)