From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 8 Jan 2010 18:29:05 +0000 (-0800)
Subject: omap: &&/|| confusion in iommu_put()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=acf9d467dc951daa0071b5a1f4bed8c108f7ebec;p=linux-beck.git

omap: &&/|| confusion in iommu_put()

obj can't be both NULL and be an error pointer.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index c0ff1e39d893..463d6386aff2 100644
--- a/arch/arm/plat-omap/iommu.c
+++ b/arch/arm/plat-omap/iommu.c
@@ -827,7 +827,7 @@ EXPORT_SYMBOL_GPL(iommu_get);
  **/
 void iommu_put(struct iommu *obj)
 {
-	if (!obj && IS_ERR(obj))
+	if (!obj || IS_ERR(obj))
 		return;
 
 	mutex_lock(&obj->iommu_lock);