[PATCH 1/5] iommu/rockchip: fix devm_request_irq and devm_free_irq parameter

From	Shunqian Zheng <zhengsq@rock-chips.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/5] iommu/rockchip: fix devm_request_irq and devm_free_irq parameter
Date	2016-05-23 03:40 +0200
Message-ID	<rBN0B-7Wt-3@gated-at.bofh.it> (permalink)
References	<rBN0C-7Wt-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Simon <xxm@rock-chips.com>

When rk_iommu_attach_device or rk_iommu_detach_device be called, the second
parameter "dev" represent the device who own the iommu, so it is not resonable
using "dev" for devm_request_irq's first parameter. To avoid potential error,
we must use iommu device itself "iommu->dev" instead, the same as devm_free_irq.

Signed-off-by: Simon <xxm@rock-chips.com>
---
 drivers/iommu/rockchip-iommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index c7d6156..ec0ce62 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -807,7 +807,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
 
 	iommu->domain = domain;
 
-	ret = devm_request_irq(dev, iommu->irq, rk_iommu_irq,
+	ret = devm_request_irq(iommu->dev, iommu->irq, rk_iommu_irq,
 			       IRQF_SHARED, dev_name(dev), iommu);
 	if (ret)
 		return ret;
@@ -860,7 +860,7 @@ static void rk_iommu_detach_device(struct iommu_domain *domain,
 	}
 	rk_iommu_disable_stall(iommu);
 
-	devm_free_irq(dev, iommu->irq, iommu);
+	devm_free_irq(iommu->dev, iommu->irq, iommu);
 
 	iommu->domain = NULL;
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/5] iommu/rockchip: fix devm_request_irq and devm_free_irq parameter Shunqian Zheng <zhengsq@rock-chips.com> - 2016-05-23 03:40 +0200
  Re: [PATCH 1/5] iommu/rockchip: fix devm_request_irq and devm_free_irq parameter Heiko Stuebner <heiko@sntech.de> - 2016-05-23 11:30 +0200

csiph-web