X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Finput%2Fevdev.c;fp=drivers%2Finput%2Fevdev.c;h=fd325ec9f064c95fafd532a7ef64e87ca88828d1;hb=879f99ef2c4c05d9a7f0a67a05f1415663119825;hp=4af24f1e91b142e7b97a928b192a02b28d0d81ab;hpb=70a26071f8552a0f193cf442f424decfe0f2e569;p=pandora-kernel.git

diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 4af24f1e91b1..fd325ec9f064 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -936,11 +936,13 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
 			return -EFAULT;
 
 		error = input_ff_upload(dev, &effect, file);
+		if (error)
+			return error;
 
 		if (put_user(effect.id, &(((struct ff_effect __user *)p)->id)))
 			return -EFAULT;
 
-		return error;
+		return 0;
 	}
 
 	/* Multi-number variable-length handlers */