[PATCH 25/26] V4L/DVB: re-add enable/disable check to the IR decoders

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



A previous cleanup patch removed more than needed. Re-add the logic that
disable the decoders.

Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index 28d7735..9d1ada9 100644
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/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/drivers/media/IR/ir-rc5-decoder.c b/drivers/media/IR/ir-rc5-decoder.c
index 61b5839..4fb3ce4 100644
--- a/drivers/media/IR/ir-rc5-decoder.c
+++ b/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;
 
-- 
1.6.6.1


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Input]     [Video for Linux]     [Gstreamer Embedded]     [Mplayer Users]     [Linux USB Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux