projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pwm/for-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
joydev.c
diff --git
a/drivers/input/joydev.c
b/drivers/input/joydev.c
index e3dcd4abae182e1f4758cc556d274cfeb09b381c..5d11fea3c8eccd10dbd892d4898d4b0ecca3aacd 100644
(file)
--- a/
drivers/input/joydev.c
+++ b/
drivers/input/joydev.c
@@
-445,10
+445,8
@@
static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
/* Validate the map. */
abspam = memdup_user(argp, len);
/* Validate the map. */
abspam = memdup_user(argp, len);
- if (IS_ERR(abspam)) {
- retval = PTR_ERR(abspam);
- goto out;
- }
+ if (IS_ERR(abspam))
+ return PTR_ERR(abspam);
for (i = 0; i < joydev->nabs; i++) {
if (abspam[i] > ABS_MAX) {
for (i = 0; i < joydev->nabs; i++) {
if (abspam[i] > ABS_MAX) {
@@
-478,10
+476,8
@@
static int joydev_handle_JSIOCSBTNMAP(struct joydev *joydev,
/* Validate the map. */
keypam = memdup_user(argp, len);
/* Validate the map. */
keypam = memdup_user(argp, len);
- if (IS_ERR(keypam)) {
- retval = PTR_ERR(keypam);
- goto out;
- }
+ if (IS_ERR(keypam))
+ return PTR_ERR(keypam);
for (i = 0; i < joydev->nkey; i++) {
if (keypam[i] > KEY_MAX || keypam[i] < BTN_MISC) {
for (i = 0; i < joydev->nkey; i++) {
if (keypam[i] > KEY_MAX || keypam[i] < BTN_MISC) {