OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4318f36
)
omap: &&/|| confusion in iommu_put()
author
Roel Kluin
<roel.kluin@gmail.com>
Fri, 8 Jan 2010 18:29:05 +0000
(10:29 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 8 Jan 2010 18:29:05 +0000
(10:29 -0800)
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>
arch/arm/plat-omap/iommu.c
patch
|
blob
|
history
diff --git
a/arch/arm/plat-omap/iommu.c
b/arch/arm/plat-omap/iommu.c
index
c0ff1e3
..
463d638
100644
(file)
--- 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);