From b88ae0e828a08266a29718dd1d3fa876cfe5c3e1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 4 Apr 2010 14:45:04 -0300 Subject: [PATCH] --- yaml --- r: 192936 b: refs/heads/master c: 7f20d32d446097789ade5ada6b645742ddac4ece h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/ir-nec-decoder.c | 3 +++ trunk/drivers/media/IR/ir-rc5-decoder.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3001a2a19170..a1ba382deb76 100644 --- 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 index 28d773563556..9d1ada95aa72 100644 --- 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 index 61b58397a3c2..4fb3ce410e24 100644 --- 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;