iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Input: walkera0701 - use proper error codes

Browse Source 
We have been using -EBUSY where we should have used -EIO or -ENOMEM,
so let's fix that and also add some diagnostic messages.

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

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

@ -197,37 +197,51 @@ static void walkera0701_close(struct input_dev *dev)
static int walkera0701_connect(struct walkera_dev *w, int parport) static int walkera0701_connect(struct walkera_dev *w, int parport)
{ {
int err = -ENODEV; int error;
w->parport = parport_find_number(parport); w->parport = parport_find_number(parport);
if (w->parport == NULL) if (!w->parport) {
pr_err("parport %d does not exist\n", parport);
return -ENODEV; return -ENODEV;
}
if (w->parport->irq == -1) { if (w->parport->irq == -1) {
pr_err("parport %d does not have interrupt assigned\n", pr_err("parport %d does not have interrupt assigned\n",
parport); parport);
goto init_err; error = -EINVAL;
goto err_put_parport;
} }
err = -EBUSY;
w->pardevice = parport_register_device(w->parport, "walkera0701", w->pardevice = parport_register_device(w->parport, "walkera0701",
NULL, NULL, walkera0701_irq_handler, NULL, NULL, walkera0701_irq_handler,
PARPORT_DEV_EXCL, w); PARPORT_DEV_EXCL, w);
if (!w->pardevice) if (!w->pardevice) {
goto init_err; pr_err("failed to register parport device\n");
error = -EIO;
goto err_put_parport;
}
if (parport_negotiate(w->pardevice->port, IEEE1284_MODE_COMPAT)) if (parport_negotiate(w->pardevice->port, IEEE1284_MODE_COMPAT)) {
goto init_err1; pr_err("failed to negotiate parport mode\n");
error = -EIO;
goto err_unregister_device;
}
if (parport_claim(w->pardevice)) if (parport_claim(w->pardevice)) {
goto init_err1; pr_err("failed to claim parport\n");
error = -EBUSY;
goto err_unregister_device;
}
hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
w->timer.function = timer_handler; w->timer.function = timer_handler;
w->input_dev = input_allocate_device(); w->input_dev = input_allocate_device();
if (!w->input_dev) if (!w->input_dev) {
goto init_err2; pr_err("failed to allocate input device\n");
error = -ENOMEM;
goto err_release_parport;
}
input_set_drvdata(w->input_dev, w); input_set_drvdata(w->input_dev, w);
w->input_dev->name = "Walkera WK-0701 TX"; w->input_dev->name = "Walkera WK-0701 TX";
@ -252,21 +266,23 @@ static int walkera0701_connect(struct walkera_dev *w, int parport)
input_set_abs_params(w->input_dev, ABS_RUDDER, -512, 512, 0, 0); input_set_abs_params(w->input_dev, ABS_RUDDER, -512, 512, 0, 0);
input_set_abs_params(w->input_dev, ABS_MISC, -512, 512, 0, 0); input_set_abs_params(w->input_dev, ABS_MISC, -512, 512, 0, 0);
err = input_register_device(w->input_dev); error = input_register_device(w->input_dev);
if (err) if (error) {
goto init_err3; pr_err("failed to register input device\n");
goto err_free_input_dev;
}
return 0; return 0;
init_err3: err_free_input_dev:
input_free_device(w->input_dev); input_free_device(w->input_dev);
init_err2: err_release_parport:
parport_release(w->pardevice); parport_release(w->pardevice);
init_err1: err_unregister_device:
parport_unregister_device(w->pardevice); parport_unregister_device(w->pardevice);
init_err: err_put_parport:
parport_put_port(w->parport); parport_put_port(w->parport);
return err; return error;
} }
static void walkera0701_disconnect(struct walkera_dev *w) static void walkera0701_disconnect(struct walkera_dev *w)