diff options
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 40244d4ce0f1..b6ef9eaad1dc 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -318,7 +318,7 @@ static unsigned int atkbd_compat_scancode(struct atkbd *atkbd, unsigned int code | |||
318 | */ | 318 | */ |
319 | 319 | ||
320 | static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | 320 | static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, |
321 | unsigned int flags, struct pt_regs *regs) | 321 | unsigned int flags) |
322 | { | 322 | { |
323 | struct atkbd *atkbd = serio_get_drvdata(serio); | 323 | struct atkbd *atkbd = serio_get_drvdata(serio); |
324 | struct input_dev *dev = atkbd->dev; | 324 | struct input_dev *dev = atkbd->dev; |
@@ -458,7 +458,6 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | |||
458 | atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2; | 458 | atkbd->time = jiffies + msecs_to_jiffies(dev->rep[REP_DELAY]) / 2; |
459 | } | 459 | } |
460 | 460 | ||
461 | input_regs(dev, regs); | ||
462 | input_event(dev, EV_KEY, keycode, value); | 461 | input_event(dev, EV_KEY, keycode, value); |
463 | input_sync(dev); | 462 | input_sync(dev); |
464 | 463 | ||
@@ -469,7 +468,6 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | |||
469 | } | 468 | } |
470 | 469 | ||
471 | if (atkbd->scroll) { | 470 | if (atkbd->scroll) { |
472 | input_regs(dev, regs); | ||
473 | if (click != -1) | 471 | if (click != -1) |
474 | input_report_key(dev, BTN_MIDDLE, click); | 472 | input_report_key(dev, BTN_MIDDLE, click); |
475 | input_report_rel(dev, REL_WHEEL, scroll); | 473 | input_report_rel(dev, REL_WHEEL, scroll); |