diff options
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r-- | drivers/input/mouse/synaptics.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 392108c436ba..49ac696d6cff 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
@@ -216,13 +216,13 @@ static void synaptics_pass_pt_packet(struct serio *ptport, unsigned char *packet | |||
216 | struct psmouse *child = serio_get_drvdata(ptport); | 216 | struct psmouse *child = serio_get_drvdata(ptport); |
217 | 217 | ||
218 | if (child && child->state == PSMOUSE_ACTIVATED) { | 218 | if (child && child->state == PSMOUSE_ACTIVATED) { |
219 | serio_interrupt(ptport, packet[1], 0, NULL); | 219 | serio_interrupt(ptport, packet[1], 0); |
220 | serio_interrupt(ptport, packet[4], 0, NULL); | 220 | serio_interrupt(ptport, packet[4], 0); |
221 | serio_interrupt(ptport, packet[5], 0, NULL); | 221 | serio_interrupt(ptport, packet[5], 0); |
222 | if (child->pktsize == 4) | 222 | if (child->pktsize == 4) |
223 | serio_interrupt(ptport, packet[2], 0, NULL); | 223 | serio_interrupt(ptport, packet[2], 0); |
224 | } else | 224 | } else |
225 | serio_interrupt(ptport, packet[1], 0, NULL); | 225 | serio_interrupt(ptport, packet[1], 0); |
226 | } | 226 | } |
227 | 227 | ||
228 | static void synaptics_pt_activate(struct psmouse *psmouse) | 228 | static void synaptics_pt_activate(struct psmouse *psmouse) |
@@ -469,13 +469,10 @@ static unsigned char synaptics_detect_pkt_type(struct psmouse *psmouse) | |||
469 | return SYN_NEWABS_STRICT; | 469 | return SYN_NEWABS_STRICT; |
470 | } | 470 | } |
471 | 471 | ||
472 | static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs) | 472 | static psmouse_ret_t synaptics_process_byte(struct psmouse *psmouse) |
473 | { | 473 | { |
474 | struct input_dev *dev = psmouse->dev; | ||
475 | struct synaptics_data *priv = psmouse->private; | 474 | struct synaptics_data *priv = psmouse->private; |
476 | 475 | ||
477 | input_regs(dev, regs); | ||
478 | |||
479 | if (psmouse->pktcnt >= 6) { /* Full packet received */ | 476 | if (psmouse->pktcnt >= 6) { /* Full packet received */ |
480 | if (unlikely(priv->pkt_type == SYN_NEWABS)) | 477 | if (unlikely(priv->pkt_type == SYN_NEWABS)) |
481 | priv->pkt_type = synaptics_detect_pkt_type(psmouse); | 478 | priv->pkt_type = synaptics_detect_pkt_type(psmouse); |