From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 30 Oct 2010 20:16:56 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v2.6.38-rc1~245^2~43
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f1e095f1d206b81b44160f41278ce5c78641e9b7;hp=1792f17b7210280a3d7ff29da9614ba779cfcedb;p=linux-2.6-block.git

Merge branch 'master' into for-next
---

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)))