Merge branch 'next' into for-linus

Prepare first round of input updates for 4.5 merge window.

diff --combined drivers/input/joystick/walkera0701.c
index 413e343f55f7c5466befe284c8fc92709127acae,9c07fe911075f3e1dba089f07d7d60d10ac327ba..70a893a17467608a103a81546eb7cce4cdf44010
--- 1/drivers/input/joystick/walkera0701.c
--- 2/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@@ -150,7 -150,7 +150,7 @@@ static void walkera0701_irq_handler(voi
                if (w->counter == 24) { /* full frame */
                        walkera0701_parse_frame(w);
                        w->counter = NO_SYNC;
-                       if (abs64(pulse_time - SYNC_PULSE) < RESERVE)   /* new frame sync */
+                       if (abs(pulse_time - SYNC_PULSE) < RESERVE)     /* new frame sync */
                                w->counter = 0;
                } else {
                        if ((pulse_time > (ANALOG_MIN_PULSE - RESERVE)
@@@ -161,7 -161,7 +161,7 @@@
                        } else
                                w->counter = NO_SYNC;
                }
-       } else if (abs64(pulse_time - SYNC_PULSE - BIN0_PULSE) <
+       } else if (abs(pulse_time - SYNC_PULSE - BIN0_PULSE) <
                                RESERVE + BIN1_PULSE - BIN0_PULSE)      /* frame sync .. */
                w->counter = 0;
  
@@@ -218,7 -218,6 +218,7 @@@ static void walkera0701_attach(struct p
  
        w->parport = pp;
  
 +      memset(&walkera0701_parport_cb, 0, sizeof(walkera0701_parport_cb));
        walkera0701_parport_cb.flags = PARPORT_FLAG_EXCL;
        walkera0701_parport_cb.irq_func = walkera0701_irq_handler;
        walkera0701_parport_cb.private = w;