aboutsummaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32
diff options
context:
space:
mode:
authorJesper Nilsson <jesper@jni.nu>2008-06-29 17:38:42 -0400
committerJesper Nilsson <jesper@jni.nu>2008-06-29 17:38:42 -0400
commit53e43d014cb7d5a3bd53dbdbf0e74977e7dda923 (patch)
tree53cb0c287e60fdf09339e985d6cedaa3e7cbcabe /arch/cris/arch-v32
parentdc1493aff0330130b2606d8accb458b1fef129a7 (diff)
parent9be48a94b8ae8c944dc918ad65f2f27e9df3ed00 (diff)
Merge branch 'pcf8563_mutex_spinlock' into cris
Diffstat (limited to 'arch/cris/arch-v32')
-rw-r--r--arch/cris/arch-v32/drivers/pcf8563.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index 53db3870ba04..f263ab571221 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -229,7 +229,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
229 229
230 if (copy_to_user((struct rtc_time *) arg, &tm, 230 if (copy_to_user((struct rtc_time *) arg, &tm,
231 sizeof tm)) { 231 sizeof tm)) {
232 spin_unlock(&rtc_lock); 232 mutex_unlock(&rtc_lock);
233 return -EFAULT; 233 return -EFAULT;
234 } 234 }
235 235