---

yaml --- r: 226285 b: refs/heads/master c: 829ba9f h: refs/heads/master i: 226283: 11c17fa v: v3
git-mirror · Dec 29, 2010 · 1cb146e · 1cb146e
1 parent c07ead7
commit 1cb146e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2
+refs/heads/master: 829ba9fe34246f1f5e813b6bf84171d36e776734
diff --git a/trunk/drivers/media/rc/ir-raw.c b/trunk/drivers/media/rc/ir-raw.c
@@ -1,4 +1,4 @@
-/* ir-raw-event.c - handle IR Pulse/Space event
+/* ir-raw.c - handle IR pulse/space events
  *
  * Copyright (C) 2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *

diff --git a/trunk/drivers/media/rc/rc-core-priv.h b/trunk/drivers/media/rc/rc-core-priv.h
@@ -13,8 +13,8 @@
  *  GNU General Public License for more details.
  */
 
-#ifndef _IR_RAW_EVENT
-#define _IR_RAW_EVENT
+#ifndef _RC_CORE_PRIV
+#define _RC_CORE_PRIV
 
 #include <linux/slab.h>
 #include <linux/spinlock.h>
@@ -190,4 +190,4 @@ void ir_raw_init(void);
 #endif
 
 
-#endif /* _IR_RAW_EVENT */
+#endif /* _RC_CORE_PRIV */
diff --git a/trunk/drivers/media/rc/rc-main.c b/trunk/drivers/media/rc/rc-main.c
@@ -1,4 +1,4 @@
-/* rc-core.c - handle IR scancode->keycode tables
+/* rc-main.c - Remote Controller core module
  *
  * Copyright (C) 2009-2010 by Mauro Carvalho Chehab <mchehab@redhat.com>
  *

diff --git a/trunk/include/media/rc-core.h b/trunk/include/media/rc-core.h
@@ -206,12 +206,12 @@ static inline u32 ir_extract_bits(u32 data, u32 mask)
 	u32 vbit = 1, value = 0;
 
 	do {
-	    if (mask & 1) {
-		if (data & 1)
-			value |= vbit;
-		vbit <<= 1;
-	    }
-	    data >>= 1;
+		if (mask & 1) {
+			if (data & 1)
+				value |= vbit;
+			vbit <<= 1;
+		}
+		data >>= 1;
 	} while (mask >>= 1);
 
 	return value;