diff options
| author | Mauro Carvalho Chehab | 2011-11-20 15:23:54 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2011-11-20 15:55:10 +0100 |
| commit | 20ae9742eba1bbd1f9d6658d1a1a72bc77fc741d (patch) | |
| tree | be6ea87314c634a9ec3164ec0d6f7700abbc6546 | |
| parent | [media] em28xx: Fix CodingStyle issues introduced by changeset 82e7dbb (diff) | |
| download | kernel-qcow2-linux-20ae9742eba1bbd1f9d6658d1a1a72bc77fc741d.tar.gz kernel-qcow2-linux-20ae9742eba1bbd1f9d6658d1a1a72bc77fc741d.tar.xz kernel-qcow2-linux-20ae9742eba1bbd1f9d6658d1a1a72bc77fc741d.zip | |
[media] em28xx: Add IR support for em2884
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 679da4804281..2630b265b0e8 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c @@ -306,7 +306,8 @@ static void em28xx_ir_handle_key(struct em28xx_IR *ir) poll_result.rc_data[0], poll_result.toggle_bit); - if (ir->dev->chip_id == CHIP_ID_EM2874) + if (ir->dev->chip_id == CHIP_ID_EM2874 || + ir->dev->chip_id == CHIP_ID_EM2884) /* The em2874 clears the readcount field every time the register is read. The em2860/2880 datasheet says that it is supposed to clear the readcount, but it doesn't. So with @@ -371,13 +372,15 @@ int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 rc_type) case CHIP_ID_EM2883: ir->get_key = default_polling_getkey; break; + case CHIP_ID_EM2884: case CHIP_ID_EM2874: case CHIP_ID_EM28174: ir->get_key = em2874_polling_getkey; em28xx_write_regs(dev, EM2874_R50_IR_CONFIG, &ir_config, 1); break; default: - printk("Unrecognized em28xx chip id: IR not supported\n"); + printk("Unrecognized em28xx chip id 0x%02x: IR not supported\n", + dev->chip_id); rc = -EINVAL; } |