Przeglądaj źródła

V4L/DVB: re-add enable/disable check to the IR decoders

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

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Mauro Carvalho Chehab 15 lat temu
rodzic
commit
7f20d32d44

+ 3 - 0
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;
 

+ 3 - 0
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;