projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iio-fixes-for-4.0a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
[cascardo/linux.git]
/
drivers
/
input
/
joystick
/
adi.c
diff --git
a/drivers/input/joystick/adi.c
b/drivers/input/joystick/adi.c
index
b784257
..
d09cefa
100644
(file)
--- a/
drivers/input/joystick/adi.c
+++ b/
drivers/input/joystick/adi.c
@@
-535,8
+535,7
@@
static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
}
}
fail2: for (i = 0; i < 2; i++)
- if (port->adi[i].dev)
- input_free_device(port->adi[i].dev);
+ input_free_device(port->adi[i].dev);
gameport_close(gameport);
fail1: gameport_set_drvdata(gameport, NULL);
kfree(port);