---

yaml --- r: 192936 b: refs/heads/master c: 7f20d32 h: refs/heads/master v: v3
git-mirror · May 19, 2010 · b88ae0e · b88ae0e
1 parent c64846b
commit b88ae0e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dfe4e8339499bfe8e9a362fefc290b4cb9c3803
+refs/heads/master: 7f20d32d446097789ade5ada6b645742ddac4ece
diff --git a/trunk/drivers/media/IR/ir-nec-decoder.c b/trunk/drivers/media/IR/ir-nec-decoder.c
@@ -142,6 +142,9 @@ static int ir_nec_decode(struct input_dev *input_dev,
 	if (!data)
 		return -EINVAL;
 
+	if (!data->enabled)
+		return 0;
+
 	/* Except for the initial event, what matters is the previous bit */
 	bit = (ev->type & IR_PULSE) ? 1 : 0;
 

diff --git a/trunk/drivers/media/IR/ir-rc5-decoder.c b/trunk/drivers/media/IR/ir-rc5-decoder.c
@@ -153,6 +153,9 @@ static int ir_rc5_decode(struct input_dev *input_dev,
 	if (!data)
 		return -EINVAL;
 
+	if (!data->enabled)
+		return 0;
+
 	/* Except for the initial event, what matters is the previous bit */
 	bit = (ev->type & IR_PULSE) ? 1 : 0;