From: tony@atomide.com (Tony Lindgren) Date: Wed, 06 Jan 2010 16:19:11 -0800 Subject: [PATCH 03/12] omap: &&/|| confusion in iommu_put() In-Reply-To: <20100107001728.21352.38471.stgit@baageli.muru.com> References: <20100107001728.21352.38471.stgit@baageli.muru.com> Message-ID: <20100107001911.21352.93513.stgit@baageli.muru.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Roel Kluin obj can't be both NULL and be an error pointer. Signed-off-by: Roel Kluin Signed-off-by: Tony Lindgren --- 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);