diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-04 14:45:04 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:56:59 -0300 |
| commit | 7f20d32d446097789ade5ada6b645742ddac4ece (patch) | |
| tree | d4e63857434911ed347bc51e0a44f8fb4916c8fb /drivers/media/IR | |
| parent | 9dfe4e8339499bfe8e9a362fefc290b4cb9c3803 (diff) | |
| download | linux-7f20d32d446097789ade5ada6b645742ddac4ece.tar.bz2 | |
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>
Diffstat (limited to 'drivers/media/IR')
| -rw-r--r-- | drivers/media/IR/ir-nec-decoder.c | 3 | ||||
| -rw-r--r-- | drivers/media/IR/ir-rc5-decoder.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c index 28d773563556..9d1ada95aa72 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 61b58397a3c2..4fb3ce410e24 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; |