telephony: fix return value

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>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 0d236f4bb8c2..2d1280a7a52b 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -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)))