---

yaml --- r: 235653 b: refs/heads/master c: b01627c h: refs/heads/master i: 235651: 0faa8f5 v: v3
git-mirror · Jan 21, 2011 · 19b5efc · 19b5efc
1 parent fb10fb8
commit 19b5efc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa96646daa15d6ac05addc7db7272dd5787c6953
+refs/heads/master: b01627c608d97b5246eb7a4b75c40f2a1fb4dc30
diff --git a/trunk/drivers/staging/tm6000/tm6000-input.c b/trunk/drivers/staging/tm6000/tm6000-input.c
@@ -374,7 +374,7 @@ int tm6000_ir_init(struct tm6000_core *dev)
 
 	ir = kzalloc(sizeof(*ir), GFP_KERNEL);
 	rc = rc_allocate_device();
-	if (!ir | !rc)
+	if (!ir || !rc)
 		goto out;
 
 	/* record handles to ourself */