---

yaml --- r: 69378 b: refs/heads/master c: 72f9df4 h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · c3c8e7c · c3c8e7c
1 parent 45c536b
commit c3c8e7c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5637f02a9cf84f2c00fd8a0f6561c375bb19103b
+refs/heads/master: 72f9df4023f9e44b29a48a5ea4954d89b18363fe
diff --git a/trunk/drivers/input/keyboard/jornada720_kbd.c b/trunk/drivers/input/keyboard/jornada720_kbd.c
@@ -59,7 +59,8 @@ static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id)
 {
 	struct platform_device *pdev = dev_id;
 	struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
-	u8 count, kbd_data;
+	struct input_dev *input = jornadakbd->input;
+	u8 count, kbd_data, scan_code;
 
 	/* startup ssp with spinlock */
 	jornada_ssp_start();
@@ -77,11 +78,12 @@ static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id)
 		while (count--) {
 			/* Exchange TxDummy for location (keymap[kbddata]) */
 			kbd_data = jornada_ssp_byte(TXDUMMY);
+			scan_code = kbd_data & 0x7f;
 
-			input_report_key(jornadakbd->input,
-					 jornadakbd->keymap[kbd_data & 0x7f],
+			input_event(input, EV_MSC, MSC_SCAN, scan_code);
+			input_report_key(input, jornadakbd->keymap[scan_code],
 					 !(kbd_data & 0x80));
-			input_sync(jornadakbd->input);
+			input_sync(input);
 		}
 	}
 
@@ -123,6 +125,8 @@ static int __devinit jornada720_kbd_probe(struct platform_device *pdev)
 		__set_bit(jornadakbd->keymap[i], input_dev->keybit);
 	__clear_bit(KEY_RESERVED, input_dev->keybit);
 
+	input_set_capability(input_dev, EV_MSC, MSC_SCAN);
+
 	err = request_irq(IRQ_GPIO0,
 			  jornada720_kbd_interrupt,
 			  IRQF_DISABLED | IRQF_TRIGGER_FALLING,