Input: don't modify the id of ioctl-provided ff effect on upload failure

If a new (id == -1) ff effect was uploaded from userspace,
ff-core.c::input_ff_upload() will have assigned a positive number to the
new effect id. Currently, evdev.c::evdev_do_ioctl() will save this new id
to userspace, regardless of whether the upload succeeded or not.

On upload failure, this can be confusing because the dev->ff->effects[]
array will not contain an element at the index of that new effect id.

This patch fixes this by leaving the id unchanged after upload fails.

Note: Unfortunately applications should still expect changed effect id for
quite some time.

This has been discussed on:
http://www.mail-archive.com/linux-input@vger.kernel.org/msg08513.html
("ff-core effect id handling in case of a failed effect upload")

Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Elias Vanderstuyft <elias.vds@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by Elias Vanderstuyft and committed by Dmitry Torokhov fc7392aa 8a0435d9

Changed files
+3 -1
drivers
input
+3 -1
drivers/input/evdev.c
··· 954 954 return -EFAULT; 955 955 956 956 error = input_ff_upload(dev, &effect, file); 957 + if (error) 958 + return error; 957 959 958 960 if (put_user(effect.id, &(((struct ff_effect __user *)p)->id))) 959 961 return -EFAULT; 960 962 961 - return error; 963 + return 0; 962 964 } 963 965 964 966 /* Multi-number variable-length handlers */