diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 900e7985d9b3..cd39aea30389 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
@@ -89,25 +89,25 @@ static int build_key(struct saa7134_dev *dev) | |||
89 | switch (dev->board) { | 89 | switch (dev->board) { |
90 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: | 90 | case SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG: |
91 | if (data == ir->mask_keycode) | 91 | if (data == ir->mask_keycode) |
92 | ir_keyup(ir->dev); | 92 | rc_keyup(ir->dev); |
93 | else | 93 | else |
94 | ir_keydown_notimeout(ir->dev, data, 0); | 94 | rc_keydown_notimeout(ir->dev, data, 0); |
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
98 | if (ir->polling) { | 98 | if (ir->polling) { |
99 | if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || | 99 | if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || |
100 | (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { | 100 | (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { |
101 | ir_keydown_notimeout(ir->dev, data, 0); | 101 | rc_keydown_notimeout(ir->dev, data, 0); |
102 | } else { | 102 | } else { |
103 | ir_keyup(ir->dev); | 103 | rc_keyup(ir->dev); |
104 | } | 104 | } |
105 | } | 105 | } |
106 | else { /* IRQ driven mode - handle key press and release in one go */ | 106 | else { /* IRQ driven mode - handle key press and release in one go */ |
107 | if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || | 107 | if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || |
108 | (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { | 108 | (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { |
109 | ir_keydown_notimeout(ir->dev, data, 0); | 109 | rc_keydown_notimeout(ir->dev, data, 0); |
110 | ir_keyup(ir->dev); | 110 | rc_keyup(ir->dev); |
111 | } | 111 | } |
112 | } | 112 | } |
113 | 113 | ||