From 877387070297c68db9af0475cd2b03bf69224925 Mon Sep 17 00:00:00 2001 From: Peter Popovec Date: Fri, 14 Dec 2012 22:57:25 -0800 Subject: [PATCH] --- yaml --- r: 346979 b: refs/heads/master c: a455e2985f57e2a71566bb8850094af38b2c932d h: refs/heads/master i: 346977: ef0c971ede417fa9932f159c4a690a7deb29e584 346975: 4ab5a4389306062e1bfc67e5b4a6dab9174cc7c5 v: v3 --- [refs] | 2 +- trunk/drivers/input/joystick/walkera0701.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8cc11a14ca58..231649fd8a4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da5ee074ce8e07b9a91596de3576b59990c0c8c6 +refs/heads/master: a455e2985f57e2a71566bb8850094af38b2c932d diff --git a/trunk/drivers/input/joystick/walkera0701.c b/trunk/drivers/input/joystick/walkera0701.c index 4dfa1eed4b7c..f8f892b076e8 100644 --- a/trunk/drivers/input/joystick/walkera0701.c +++ b/trunk/drivers/input/joystick/walkera0701.c @@ -196,6 +196,7 @@ static void walkera0701_close(struct input_dev *dev) struct walkera_dev *w = input_get_drvdata(dev); parport_disable_irq(w->parport); + hrtimer_cancel(&w->timer); } static int walkera0701_connect(struct walkera_dev *w, int parport) @@ -224,6 +225,9 @@ static int walkera0701_connect(struct walkera_dev *w, int parport) if (parport_claim(w->pardevice)) goto init_err1; + hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + w->timer.function = timer_handler; + w->input_dev = input_allocate_device(); if (!w->input_dev) goto init_err2; @@ -254,8 +258,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport) if (err) goto init_err3; - hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); - w->timer.function = timer_handler; return 0; init_err3: @@ -271,7 +273,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport) static void walkera0701_disconnect(struct walkera_dev *w) { - hrtimer_cancel(&w->timer); input_unregister_device(w->input_dev); parport_release(w->pardevice); parport_unregister_device(w->pardevice);