Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / keyboard / sunkbd.c

diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index b15b6d8d4f83c5ade9adfc1476332459a296e627..cac4781103c3ed1cb45a31d22bc0486aa5492e02 100644 (file)
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -94,7 +94,7 @@ struct sunkbd {
  */
 
 static irqreturn_t sunkbd_interrupt(struct serio *serio,
-               unsigned char data, unsigned int flags, struct pt_regs *regs)
+               unsigned char data, unsigned int flags)
 {
        struct sunkbd* sunkbd = serio_get_drvdata(serio);
 
@@ -129,7 +129,6 @@ static irqreturn_t sunkbd_interrupt(struct serio *serio,
                                break;
 
                        if (sunkbd->keycode[data & SUNKBD_KEY]) {
-                               input_regs(sunkbd->dev, regs);
                                 input_report_key(sunkbd->dev, sunkbd->keycode[data & SUNKBD_KEY], !(data & SUNKBD_RELEASE));
                                input_sync(sunkbd->dev);
                         } else {
@@ -263,7 +262,7 @@ static int sunkbd_connect(struct serio *serio, struct serio_driver *drv)
                goto fail;
        }
 
-       sprintf(sunkbd->name, "Sun Type %d keyboard", sunkbd->type);
+       snprintf(sunkbd->name, sizeof(sunkbd->name), "Sun Type %d keyboard", sunkbd->type);
        memcpy(sunkbd->keycode, sunkbd_keycode, sizeof(sunkbd->keycode));
 
        input_dev->name = sunkbd->name;