From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752884AbcEWBiY (ORCPT ); Sun, 22 May 2016 21:38:24 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:36344 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752802AbcEWBht (ORCPT ); Sun, 22 May 2016 21:37:49 -0400 From: Shunqian Zheng To: joro@8bytes.org, heiko@sntech.de Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Simon Subject: [PATCH 1/5] iommu/rockchip: fix devm_request_irq and devm_free_irq parameter Date: Mon, 23 May 2016 09:37:15 +0800 Message-Id: <1463967439-13354-2-git-send-email-zhengsq@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463967439-13354-1-git-send-email-zhengsq@rock-chips.com> References: <1463967439-13354-1-git-send-email-zhengsq@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Simon 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 --- 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