diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9015.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 31c0a0ed39f5..8671ca362c81 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
| @@ -1041,13 +1041,13 @@ static int af9015_rc_query(struct dvb_usb_device *d) | |||
| 1041 | priv->rc_keycode = buf[12] << 16 | | 1041 | priv->rc_keycode = buf[12] << 16 | |
| 1042 | buf[13] << 8 | buf[14]; | 1042 | buf[13] << 8 | buf[14]; |
| 1043 | } | 1043 | } |
| 1044 | ir_keydown(d->rc_input_dev, priv->rc_keycode, 0); | 1044 | rc_keydown(d->rc_dev, priv->rc_keycode, 0); |
| 1045 | } else { | 1045 | } else { |
| 1046 | priv->rc_keycode = 0; /* clear just for sure */ | 1046 | priv->rc_keycode = 0; /* clear just for sure */ |
| 1047 | } | 1047 | } |
| 1048 | } else if (priv->rc_repeat != buf[6] || buf[0]) { | 1048 | } else if (priv->rc_repeat != buf[6] || buf[0]) { |
| 1049 | deb_rc("%s: key repeated\n", __func__); | 1049 | deb_rc("%s: key repeated\n", __func__); |
| 1050 | ir_keydown(d->rc_input_dev, priv->rc_keycode, 0); | 1050 | rc_keydown(d->rc_dev, priv->rc_keycode, 0); |
| 1051 | } else { | 1051 | } else { |
| 1052 | deb_rc("%s: no key press\n", __func__); | 1052 | deb_rc("%s: no key press\n", __func__); |
| 1053 | } | 1053 | } |
| @@ -1344,13 +1344,11 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1344 | .identify_state = af9015_identify_state, | 1344 | .identify_state = af9015_identify_state, |
| 1345 | 1345 | ||
| 1346 | .rc.core = { | 1346 | .rc.core = { |
| 1347 | .protocol = IR_TYPE_NEC, | 1347 | .protocol = RC_TYPE_NEC, |
| 1348 | .module_name = "af9015", | 1348 | .module_name = "af9015", |
| 1349 | .rc_query = af9015_rc_query, | 1349 | .rc_query = af9015_rc_query, |
| 1350 | .rc_interval = AF9015_RC_INTERVAL, | 1350 | .rc_interval = AF9015_RC_INTERVAL, |
| 1351 | .rc_props = { | 1351 | .allowed_protos = RC_TYPE_NEC, |
| 1352 | .allowed_protos = IR_TYPE_NEC, | ||
| 1353 | }, | ||
| 1354 | }, | 1352 | }, |
| 1355 | 1353 | ||
| 1356 | .i2c_algo = &af9015_i2c_algo, | 1354 | .i2c_algo = &af9015_i2c_algo, |
| @@ -1474,13 +1472,11 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1474 | .identify_state = af9015_identify_state, | 1472 | .identify_state = af9015_identify_state, |
| 1475 | 1473 | ||
| 1476 | .rc.core = { | 1474 | .rc.core = { |
| 1477 | .protocol = IR_TYPE_NEC, | 1475 | .protocol = RC_TYPE_NEC, |
| 1478 | .module_name = "af9015", | 1476 | .module_name = "af9015", |
| 1479 | .rc_query = af9015_rc_query, | 1477 | .rc_query = af9015_rc_query, |
| 1480 | .rc_interval = AF9015_RC_INTERVAL, | 1478 | .rc_interval = AF9015_RC_INTERVAL, |
| 1481 | .rc_props = { | 1479 | .allowed_protos = RC_TYPE_NEC, |
| 1482 | .allowed_protos = IR_TYPE_NEC, | ||
| 1483 | }, | ||
| 1484 | }, | 1480 | }, |
| 1485 | 1481 | ||
| 1486 | .i2c_algo = &af9015_i2c_algo, | 1482 | .i2c_algo = &af9015_i2c_algo, |
| @@ -1588,13 +1584,11 @@ static struct dvb_usb_device_properties af9015_properties[] = { | |||
| 1588 | .identify_state = af9015_identify_state, | 1584 | .identify_state = af9015_identify_state, |
| 1589 | 1585 | ||
| 1590 | .rc.core = { | 1586 | .rc.core = { |
| 1591 | .protocol = IR_TYPE_NEC, | 1587 | .protocol = RC_TYPE_NEC, |
| 1592 | .module_name = "af9015", | 1588 | .module_name = "af9015", |
| 1593 | .rc_query = af9015_rc_query, | 1589 | .rc_query = af9015_rc_query, |
| 1594 | .rc_interval = AF9015_RC_INTERVAL, | 1590 | .rc_interval = AF9015_RC_INTERVAL, |
| 1595 | .rc_props = { | 1591 | .allowed_protos = RC_TYPE_NEC, |
| 1596 | .allowed_protos = IR_TYPE_NEC, | ||
| 1597 | }, | ||
| 1598 | }, | 1592 | }, |
| 1599 | 1593 | ||
| 1600 | .i2c_algo = &af9015_i2c_algo, | 1594 | .i2c_algo = &af9015_i2c_algo, |