From: Joerg Roedel <jroedel@suse.de>
Date: Thu, 28 May 2015 16:41:28 +0000 (+0200)
Subject: iommu: Call remove_device call-back after driver release
X-Git-Tag: firefly_0821_release~176^2~1511^2~4^6~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=843cb6dc7749a25849797cc9aeeb86f87a8acb84;p=firefly-linux-kernel-4.4.55.git

iommu: Call remove_device call-back after driver release

Do not remove the device from the IOMMU while the driver is
still attached.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index f0e0a233c902..d69e0ca77f82 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -779,7 +779,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
 	if (action == BUS_NOTIFY_ADD_DEVICE) {
 		if (ops->add_device)
 			return ops->add_device(dev);
-	} else if (action == BUS_NOTIFY_DEL_DEVICE) {
+	} else if (action == BUS_NOTIFY_REMOVED_DEVICE) {
 		if (ops->remove_device && dev->iommu_group) {
 			ops->remove_device(dev);
 			return 0;