diff --git a/[refs] b/[refs]
index 18b49937b550..244ec83a5809 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2607b0a26094b2d2d174c3e27b2ecc9c49d86f40
+refs/heads/master: 00d4b2bb03b9ed27f28336b0a68f2bd7f67caa40
diff --git a/trunk/arch/arm/mach-msm/iommu.c b/trunk/arch/arm/mach-msm/iommu.c
index 74f2157eba4e..67e8f531b7af 100644
--- a/trunk/arch/arm/mach-msm/iommu.c
+++ b/trunk/arch/arm/mach-msm/iommu.c
@@ -241,6 +241,11 @@ static int msm_iommu_attach_dev(struct iommu_domain *domain, struct device *dev)
 		goto fail;
 	}
 
+	if (!list_empty(&ctx_drvdata->attached_elm)) {
+		ret = -EBUSY;
+		goto fail;
+	}
+
 	list_for_each_entry(tmp_drvdata, &priv->list_attached, attached_elm)
 		if (tmp_drvdata == ctx_drvdata) {
 			ret = -EBUSY;