Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 15:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: walkera0701 - claim parport when opening the device

Browse Source 
Postpone claiming the port until the device is opened, instead of doing
that when the driver is loaded.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2012-12-16 22:59:12 -08:00
parent ea05ae071e
commit cb696e7cf2
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/joystick/walkera0701.c
View File

@ -183,6 +183,9 @@ static int walkera0701_open(struct input_dev *dev)
{
struct walkera_dev *w = input_get_drvdata(dev);
if (parport_claim(w->pardevice))
return -EBUSY;
parport_enable_irq(w->parport);
return 0;
}
@ -193,6 +196,8 @@ static void walkera0701_close(struct input_dev *dev)
parport_disable_irq(w->parport);
hrtimer_cancel(&w->timer);
parport_release(w->pardevice);
}
static int walkera0701_connect(struct walkera_dev *w, int parport)
@ -227,12 +232,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
goto err_unregister_device;
}
if (parport_claim(w->pardevice)) {
pr_err("failed to claim parport\n");
error = -EBUSY;
goto err_unregister_device;
}
hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
w->timer.function = timer_handler;
@ -240,7 +239,7 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
if (!w->input_dev) {
pr_err("failed to allocate input device\n");
error = -ENOMEM;
goto err_release_parport;
goto err_unregister_device;
}
input_set_drvdata(w->input_dev, w);
@ -276,8 +275,6 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
err_free_input_dev:
input_free_device(w->input_dev);
err_release_parport:
parport_release(w->pardevice);
err_unregister_device:
parport_unregister_device(w->pardevice);
err_put_parport:
@ -288,7 +285,6 @@ err_put_parport:
static void walkera0701_disconnect(struct walkera_dev *w)
{
input_unregister_device(w->input_dev);
parport_release(w->pardevice);
parport_unregister_device(w->pardevice);
parport_put_port(w->parport);
}