telephony: fix return value
Nicolas Kaiser [Fri, 29 Oct 2010 09:41:42 +0000 (11:41 +0200)]
If copy_from_user fails, the return value gets overwritten.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/telephony/ixj.c

index 0d236f4..2d1280a 100644 (file)
@@ -6581,7 +6581,8 @@ static long do_ixj_ioctl(struct file *file_p, unsigned int cmd, unsigned long ar
        case IXJCTL_SET_FILTER:
                if (copy_from_user(&jf, argp, sizeof(jf))) 
                        retval = -EFAULT;
-               retval = ixj_init_filter(j, &jf);
+               else
+                       retval = ixj_init_filter(j, &jf);
                break;
        case IXJCTL_SET_FILTER_RAW:
                if (copy_from_user(&jfr, argp, sizeof(jfr)))