summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/pvrusb2
diff options
context:
space:
mode:
authorSean Young2016-09-20 00:21:23 +0200
committerMauro Carvalho Chehab2016-09-22 16:44:52 +0200
commit00bb820755ed8ee996f076f193d2eadbfba50a2e (patch)
tree8e69e36976493c747e4708af57cba94a9ea973b6 /drivers/media/usb/pvrusb2
parent[media] rc: rc6 decoder should report protocol correctly (diff)
downloadkernel-qcow2-linux-00bb820755ed8ee996f076f193d2eadbfba50a2e.tar.gz
kernel-qcow2-linux-00bb820755ed8ee996f076f193d2eadbfba50a2e.tar.xz
kernel-qcow2-linux-00bb820755ed8ee996f076f193d2eadbfba50a2e.zip
[media] rc: Hauppauge z8f0811 can decode RC6
The hardware does not decode the 16, 20 or 24 bit variety. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/usb/pvrusb2')
-rw-r--r--drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
index 14321d0a1833..6da5fb544817 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c
@@ -596,7 +596,8 @@ static void pvr2_i2c_register_ir(struct pvr2_hdw *hdw)
case PVR2_IR_SCHEME_24XXX_MCE: /* 24xxx MCE device */
init_data->ir_codes = RC_MAP_HAUPPAUGE;
init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
- init_data->type = RC_BIT_RC5;
+ init_data->type = RC_BIT_RC5 | RC_BIT_RC6_MCE |
+ RC_BIT_RC6_6A_32;
init_data->name = hdw->hdw_desc->description;
/* IR Receiver */
info.addr = 0x71;