diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-14 00:59:19 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:10:24 -0500 |
commit | 3f831107ed8efc32960e0cd172799bb82f6c81c9 (patch) | |
tree | b8ae7ae9294d836c612ee203cb733424823e43b0 /drivers | |
parent | eecee32ac2c4b00b76cc8d99fd8d2b9fd54a283d (diff) |
V4L/DVB (13641): Properly update the driver representation for the protocol
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 3 |
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) | |||
349 | 349 | ||
350 | /* Adjust xclk based o IR table for RC5/NEC tables */ | 350 | /* Adjust xclk based o IR table for RC5/NEC tables */ |
351 | 351 | ||
352 | dev->board.ir_codes->ir_type = IR_TYPE_OTHER; | ||
352 | if (ir_type == IR_TYPE_RC5) { | 353 | if (ir_type == IR_TYPE_RC5) { |
353 | dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE; | 354 | dev->board.xclk |= EM28XX_XCLK_IR_RC5_MODE; |
354 | ir->full_code = 1; | 355 | ir->full_code = 1; |
@@ -359,6 +360,8 @@ int em28xx_ir_change_protocol(void *priv, enum ir_type ir_type) | |||
359 | } else | 360 | } else |
360 | rc = -EINVAL; | 361 | rc = -EINVAL; |
361 | 362 | ||
363 | dev->board.ir_codes->ir_type = ir_type; | ||
364 | |||
362 | em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk, | 365 | em28xx_write_reg_bits(dev, EM28XX_R0F_XCLK, dev->board.xclk, |
363 | EM28XX_XCLK_IR_RC5_MODE); | 366 | EM28XX_XCLK_IR_RC5_MODE); |
364 | 367 | ||