aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGravatar Axel Lin <axel.lin@ingics.com> 2014-11-01 11:45:32 +0800
committerGravatar Joerg Roedel <jroedel@suse.de> 2014-11-04 15:08:16 +0100
commite222d6a4259c134553acab493b5ab9fc05d70132 (patch)
tree002b92091c28d08489f45cc6472ed7e8db6ba81c /drivers
parentLinux 3.18-rc3 (diff)
downloadlinux-e222d6a4259c134553acab493b5ab9fc05d70132.tar.gz
linux-e222d6a4259c134553acab493b5ab9fc05d70132.tar.bz2
linux-e222d6a4259c134553acab493b5ab9fc05d70132.zip
iommu/ipmmu-vmsa: Return proper error if devm_request_irq fails
Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/ipmmu-vmsa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
index 7dab5cbcc775..d25fa125e869 100644
--- a/drivers/iommu/ipmmu-vmsa.c
+++ b/drivers/iommu/ipmmu-vmsa.c
@@ -1184,7 +1184,7 @@ static int ipmmu_probe(struct platform_device *pdev)
dev_name(&pdev->dev), mmu);
if (ret < 0) {
dev_err(&pdev->dev, "failed to request IRQ %d\n", irq);
- return irq;
+ return ret;
}
ipmmu_device_reset(mmu);