[PATCH 01/12] iommu/amd: Do not BUG_ON in __detach_device()

From: Joerg Roedel
Date: Tue Oct 20 2015 - 11:33:57 EST


From: Joerg Roedel <jroedel@xxxxxxx>

The condition in the BUG_ON is an indicator of a BUG, but no
reason to kill the code path. Turn it into a WARN_ON and
bail out if it is hit.

Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
---
drivers/iommu/amd_iommu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 08d2775..bde87be 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2213,7 +2213,8 @@ static void __detach_device(struct iommu_dev_data *dev_data)
struct protection_domain *domain;
unsigned long flags;

- BUG_ON(!dev_data->domain);
+ if (WARN_ON(!dev_data->domain))
+ return;

domain = dev_data->domain;

--
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/