The patch titled
stowaway-keyboard-support update
has been removed from the -mm tree. Its filename is
stowaway-keyboard-support-update.patch
This patch was dropped because it was folded into stowaway-keyboard-support.patch
------------------------------------------------------
Subject: stowaway-keyboard-support update
From: Marek Vasut <marek.vasut@xxxxxxxxx>
I improved it a bit (made the code in skbd_interrupt more logical and added
handling for possible failure of input_register_device).
Signed-off-by: Marek Vasut <marek.vasut@xxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/input/keyboard/stowaway.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff -puN drivers/input/keyboard/stowaway.c~stowaway-keyboard-support-update drivers/input/keyboard/stowaway.c
--- a/drivers/input/keyboard/stowaway.c~stowaway-keyboard-support-update
+++ a/drivers/input/keyboard/stowaway.c
@@ -25,8 +25,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Should you need to contact me, the author, you can do so either by
- * e-mail - mail your message to <j.cormack@xxxxxxxxxxxx>, or by paper mail:
- * Justin Cormack, 68 Dartmouth Park Road, London NW5 1SN, UK.
+ * e-mail - mail your message to <marek.vasut@xxxxxxxxx>, or by paper mail:
+ * Marek Vasut, Liskovecka 559, Frydek-Mistek, 738 01 Czech Republic
*/
#include <linux/slab.h>
@@ -74,19 +74,19 @@ static irqreturn_t skbd_interrupt(struct
unsigned char data, unsigned int flags, struct pt_regs *regs)
{
struct skbd *skbd = serio_get_drvdata(serio);
- /* check if this is keypress */
- if (data < 0x80) {
/* invalid scan codes are probably the init sequence, so we ignore them */
- if (skbd->keycode[data & SKBD_KEY]) {
+ if (skbd->keycode[data & SKBD_KEY]) {
+ /* check if this is keypress */
+ if (data < 0x80) {
input_regs(skbd->dev, regs);
input_report_key(skbd->dev, skbd->keycode[data & SKBD_KEY], 1);
input_sync(skbd->dev);
- }
- else if (data == 0xe7) /* end of init sequence */
- printk(KERN_INFO "input: %s on %s\n", skbd->dev->name, serio->phys);
- } else {
+ } else {
input_report_key(skbd->dev, skbd->keycode[data & SKBD_KEY], 0);
+ }
}
+ else if (data == 0xe7) /* end of init sequence */
+ printk(KERN_INFO "input: %s on %s\n", skbd->dev->name, serio->phys);
return IRQ_HANDLED;
}
@@ -131,7 +131,11 @@ static int skbd_connect(struct serio *se
if (err)
goto fail;
- input_register_device(skbd->dev);
+ if (input_register_device(skbd->dev)){
+ serio_close(serio);
+ goto fail;
+ }
+
return 0;
fail: serio_set_drvdata(serio, NULL);
_
Patches currently in -mm which might be from marek.vasut@xxxxxxxxx are
stowaway-keyboard-support.patch
stowaway-keyboard-support-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
