aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index f658f2513992..439f3d54d009 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -102,14 +102,14 @@ static int build_key(struct saa7134_dev *dev)
102 if (data == ir->mask_keycode) 102 if (data == ir->mask_keycode)
103 ir_input_nokey(ir->dev, &ir->ir); 103 ir_input_nokey(ir->dev, &ir->ir);
104 else 104 else
105 ir_input_keydown(ir->dev, &ir->ir, data, data); 105 ir_input_keydown(ir->dev, &ir->ir, data);
106 return 0; 106 return 0;
107 } 107 }
108 108
109 if (ir->polling) { 109 if (ir->polling) {
110 if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || 110 if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) ||
111 (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { 111 (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) {
112 ir_input_keydown(ir->dev, &ir->ir, data, data); 112 ir_input_keydown(ir->dev, &ir->ir, data);
113 } else { 113 } else {
114 ir_input_nokey(ir->dev, &ir->ir); 114 ir_input_nokey(ir->dev, &ir->ir);
115 } 115 }
@@ -117,7 +117,7 @@ static int build_key(struct saa7134_dev *dev)
117 else { /* IRQ driven mode - handle key press and release in one go */ 117 else { /* IRQ driven mode - handle key press and release in one go */
118 if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) || 118 if ((ir->mask_keydown && (0 != (gpio & ir->mask_keydown))) ||
119 (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) { 119 (ir->mask_keyup && (0 == (gpio & ir->mask_keyup)))) {
120 ir_input_keydown(ir->dev, &ir->ir, data, data); 120 ir_input_keydown(ir->dev, &ir->ir, data);
121 ir_input_nokey(ir->dev, &ir->ir); 121 ir_input_nokey(ir->dev, &ir->ir);
122 } 122 }
123 } 123 }
@@ -938,7 +938,7 @@ static void nec_task(unsigned long data)
938 dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n", 938 dprintk("scancode = 0x%02x (code = 0x%02x, notcode= 0x%02x)\n",
939 ir->code, ircode, not_code); 939 ir->code, ircode, not_code);
940 940
941 ir_input_keydown(ir->dev, &ir->ir, ir->code, ir->code); 941 ir_input_keydown(ir->dev, &ir->ir, ir->code);
942 } else 942 } else
943 dprintk("Repeat last key\n"); 943 dprintk("Repeat last key\n");
944 944