git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
arch
/
cris
/
arch-v10
/
drivers
/
pcf8563.c
diff --git
a/arch/cris/arch-v10/drivers/pcf8563.c
b/arch/cris/arch-v10/drivers/pcf8563.c
index
ea69fab
..
1391b73
100644
(file)
--- a/
arch/cris/arch-v10/drivers/pcf8563.c
+++ b/
arch/cris/arch-v10/drivers/pcf8563.c
@@
-345,7
+345,7
@@
static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned
int ret;
mutex_lock(&pcf8563_mutex);
- ret
urn
pcf8563_ioctl(filp, cmd, arg);
+ ret
=
pcf8563_ioctl(filp, cmd, arg);
mutex_unlock(&pcf8563_mutex);
return ret;