summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper@jni.nu>2008-06-29 23:38:42 +0200
committerJesper Nilsson <jesper@jni.nu>2008-06-29 23:38:42 +0200
commit53e43d014cb7d5a3bd53dbdbf0e74977e7dda923 (patch)
tree53cb0c287e60fdf09339e985d6cedaa3e7cbcabe /arch/cris
parentdc1493aff0330130b2606d8accb458b1fef129a7 (diff)
parent9be48a94b8ae8c944dc918ad65f2f27e9df3ed00 (diff)
downloadlinux-3.10-53e43d014cb7d5a3bd53dbdbf0e74977e7dda923.tar.gz
linux-3.10-53e43d014cb7d5a3bd53dbdbf0e74977e7dda923.tar.bz2
linux-3.10-53e43d014cb7d5a3bd53dbdbf0e74977e7dda923.zip
Merge branch 'pcf8563_mutex_spinlock' into cris
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/drivers/pcf8563.c2
-rw-r--r--arch/cris/arch-v32/drivers/pcf8563.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index 52103d16dc6..8769dc91407 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -233,7 +233,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) {
- spin_unlock(&rtc_lock);
+ mutex_unlock(&rtc_lock);
return -EFAULT;
}
diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index 53db3870ba0..f263ab57122 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,
if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) {
- spin_unlock(&rtc_lock);
+ mutex_unlock(&rtc_lock);
return -EFAULT;
}