diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2010-01-08 10:29:05 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-01-08 10:29:05 -0800 |
| commit | acf9d467dc951daa0071b5a1f4bed8c108f7ebec (patch) | |
| tree | 46a8ca47b69eecebf10b7c07550466f258a8c0f1 /arch | |
| parent | 4318f36b7c93a60a100f43fc6b7f13bebc59d017 (diff) | |
| download | op-kernel-dev-acf9d467dc951daa0071b5a1f4bed8c108f7ebec.zip op-kernel-dev-acf9d467dc951daa0071b5a1f4bed8c108f7ebec.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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); |
