summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-input.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-12-14 06:59:19 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 19:10:24 +0100
commit3f831107ed8efc32960e0cd172799bb82f6c81c9 (patch)
treeb8ae7ae9294d836c612ee203cb733424823e43b0 /drivers/media/video/em28xx/em28xx-input.c
parentV4L/DVB (13639): ir-sysfs: Properly protect rc_tab changes with a lock (diff)
downloadlinux-3f831107ed8efc32960e0cd172799bb82f6c81c9.tar.xz
linux-3f831107ed8efc32960e0cd172799bb82f6c81c9.zip
V4L/DVB (13641): Properly update the driver representation for the protocol
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-input.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index ebb75a867f03..674622372d4d 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -349,6 +349,7 @@ int em28xx_ir_change_protocol(void *priv, enum ir_type ir_type)
/* Adjust xclk based o IR table for RC5/NEC tables */
+ dev->board.ir_codes->ir_type = IR_TYPE_OTHER;
if (ir_type == IR_TYPE_RC5) {
dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE;
ir->full_code = 1;
@@ -359,6 +360,8 @@ int em28xx_ir_change_protocol(void *priv, enum ir_type ir_type)
} else
rc = -EINVAL;
+ dev->board.ir_codes->ir_type = ir_type;
+
em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk,
EM28XX_XCLK_IR_RC5_MODE);