git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
1792f17
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000
(22:16 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000
(22:16 +0200)
drivers/telephony/ixj.c
patch
|
blob
|
history
diff --git
a/drivers/telephony/ixj.c
b/drivers/telephony/ixj.c
index
0d236f4
..
2d1280a
100644
(file)
--- 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)))