diff options
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/anysee.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_core.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dib0700_devices.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/lmedm04.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index e9cacf6e927..2d8b4044be3 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -531,7 +531,7 @@ static void dm1105_emit_key(struct work_struct *work) | |||
531 | 531 | ||
532 | data = (ircom >> 8) & 0x7f; | 532 | data = (ircom >> 8) & 0x7f; |
533 | 533 | ||
534 | ir_keydown(ir->dev, data, 0); | 534 | rc_keydown(ir->dev, data, 0); |
535 | } | 535 | } |
536 | 536 | ||
537 | /* work handler */ | 537 | /* work handler */ |
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index 8b9ab3002e1..bc2a6e464ce 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_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_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 | } |
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c index c6e4ba53ad6..5e12488f3c7 100644 --- a/drivers/media/dvb/dvb-usb/anysee.c +++ b/drivers/media/dvb/dvb-usb/anysee.c | |||
@@ -394,7 +394,7 @@ static int anysee_rc_query(struct dvb_usb_device *d) | |||
394 | 394 | ||
395 | if (ircode[0]) { | 395 | if (ircode[0]) { |
396 | deb_rc("%s: key pressed %02x\n", __func__, ircode[1]); | 396 | deb_rc("%s: key pressed %02x\n", __func__, ircode[1]); |
397 | ir_keydown(d->rc_dev, 0x08 << 8 | ircode[1], 0); | 397 | rc_keydown(d->rc_dev, 0x08 << 8 | ircode[1], 0); |
398 | } | 398 | } |
399 | 399 | ||
400 | return 0; | 400 | return 0; |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c index 3b58f457568..1dd119e7b67 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_core.c +++ b/drivers/media/dvb/dvb-usb/dib0700_core.c | |||
@@ -600,7 +600,7 @@ static void dib0700_rc_urb_completion(struct urb *purb) | |||
600 | goto resubmit; | 600 | goto resubmit; |
601 | } | 601 | } |
602 | 602 | ||
603 | ir_keydown(d->rc_dev, keycode, toggle); | 603 | rc_keydown(d->rc_dev, keycode, toggle); |
604 | 604 | ||
605 | resubmit: | 605 | resubmit: |
606 | /* Clean the buffer before we requeue */ | 606 | /* Clean the buffer before we requeue */ |
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c index be167f2bea3..9ac920d0483 100644 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c | |||
@@ -520,13 +520,13 @@ static int dib0700_rc_query_old_firmware(struct dvb_usb_device *d) | |||
520 | d->last_event = keycode; | 520 | d->last_event = keycode; |
521 | } | 521 | } |
522 | 522 | ||
523 | ir_keydown(d->rc_dev, keycode, 0); | 523 | rc_keydown(d->rc_dev, keycode, 0); |
524 | break; | 524 | break; |
525 | default: | 525 | default: |
526 | /* RC-5 protocol changes toggle bit on new keypress */ | 526 | /* RC-5 protocol changes toggle bit on new keypress */ |
527 | keycode = key[3-2] << 8 | key[3-3]; | 527 | keycode = key[3-2] << 8 | key[3-3]; |
528 | toggle = key[3-1]; | 528 | toggle = key[3-1]; |
529 | ir_keydown(d->rc_dev, keycode, toggle); | 529 | rc_keydown(d->rc_dev, keycode, toggle); |
530 | 530 | ||
531 | break; | 531 | break; |
532 | } | 532 | } |
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c index f0c030837f2..1455c238b01 100644 --- a/drivers/media/dvb/dvb-usb/lmedm04.c +++ b/drivers/media/dvb/dvb-usb/lmedm04.c | |||
@@ -198,7 +198,7 @@ static int lme2510_remote_keypress(struct dvb_usb_adapter *adap, u16 keypress) | |||
198 | deb_info(1, "INT Key Keypress =%04x", keypress); | 198 | deb_info(1, "INT Key Keypress =%04x", keypress); |
199 | 199 | ||
200 | if (keypress > 0) | 200 | if (keypress > 0) |
201 | ir_keydown(d->rc_dev, keypress, 0); | 201 | rc_keydown(d->rc_dev, keypress, 0); |
202 | 202 | ||
203 | return 0; | 203 | return 0; |
204 | } | 204 | } |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 32caa9b7af8..8ae67c1751a 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -159,7 +159,7 @@ static void msp430_ir_interrupt(unsigned long data) | |||
159 | budget_ci->ir.rc5_device != (command & 0x1f)) | 159 | budget_ci->ir.rc5_device != (command & 0x1f)) |
160 | return; | 160 | return; |
161 | 161 | ||
162 | ir_keydown(dev, budget_ci->ir.ir_key, (command & 0x20) ? 1 : 0); | 162 | rc_keydown(dev, budget_ci->ir.ir_key, (command & 0x20) ? 1 : 0); |
163 | } | 163 | } |
164 | 164 | ||
165 | static int msp430_ir_init(struct budget_ci *budget_ci) | 165 | static int msp430_ir_init(struct budget_ci *budget_ci) |