[PATCH 03/12] omap: &&/|| confusion in iommu_put()

Tony Lindgren tony at atomide.com
Wed Jan 6 19:19:11 EST 2010


From: Roel Kluin <roel.kluin at gmail.com>

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

Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: Tony Lindgren <tony at atomide.com>
---
 arch/arm/plat-omap/iommu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/iommu.c b/arch/arm/plat-omap/iommu.c
index c0ff1e3..463d638 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);




More information about the linux-arm-kernel mailing list