| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Sat Oct 30 22:16:56 2010 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Sat Oct 30 22:16:56 2010 +0200 |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 [diff] | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb [diff] |
Merge branch 'master' into for-next
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 0d236f4..2d1280a 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c
@@ -6581,7 +6581,8 @@ 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)))