V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key

[mirror_ubuntu-bionic-kernel.git] / drivers / media / dvb / dvb-usb / digitv.c

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index e826077094fa70b6dfb579b3b28047150e49c9ed..73f14a24ffab9b68b1e05654ba3c14a963d5d35c 100644 (file)
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -161,7 +161,7 @@ static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
        return 0;
 }
 
-static struct dvb_usb_rc_key ir_codes_digitv_table[] = {
+static struct ir_scancode ir_codes_digitv_table[] = {
        { 0x5f55, KEY_0 },
        { 0x6f55, KEY_1 },
        { 0x9f55, KEY_2 },
@@ -240,7 +240,7 @@ static int digitv_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
                  for (i = 0; i < d->props.rc_key_map_size; i++) {
                        if (rc5_custom(&d->props.rc_key_map[i]) == key[1] &&
                            rc5_data(&d->props.rc_key_map[i]) == key[2]) {
-                               *event = d->props.rc_key_map[i].event;
+                               *event = d->props.rc_key_map[i].keycode;
                                *state = REMOTE_KEY_PRESSED;
                                return 0;
                        }