aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/joystick/walkera0701.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-10-22 16:10:35 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-10-22 16:10:35 +1100
commit164006da925cd3f87e496b9bb656ac4f0e962fd6 (patch)
tree47f03f0c2283171e8f0ba25cbc2c576ab133ea5c /drivers/input/joystick/walkera0701.c
parentcb49d422259a71deb42fbf6b88f6b68a7a3f1358 (diff)
parent167b7c975c426102f1e83b302ac66891ee3960ca (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/input/joystick/walkera0701.c')
-rw-r--r--drivers/input/joystick/walkera0701.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
index d88f5dd3c9d9..9c07fe911075 100644
--- a/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@ -150,7 +150,7 @@ static void walkera0701_irq_handler(void *handler_data)
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 @@ static void walkera0701_irq_handler(void *handler_data)
} 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;