commit 53e43d014cb7d5a3bd53dbdbf0e74977e7dda923
author Jesper Nilsson <jesper@jni.nu> Sun Jun 29 23:38:42 2008 +0200
committer Jesper Nilsson <jesper@jni.nu> Sun Jun 29 23:38:42 2008 +0200
tree 53cb0c287e60fdf09339e985d6cedaa3e7cbcabe
parent dc1493aff0330130b2606d8accb458b1fef129a7
parent 9be48a94b8ae8c944dc918ad65f2f27e9df3ed00

Merge branch 'pcf8563_mutex_spinlock' into cris

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 52103d1..8769dc91 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -233,7 +233,7 @@
 
 		if (copy_to_user((struct rtc_time *) arg, &tm,
 				 sizeof tm)) {
-			spin_unlock(&rtc_lock);
+			mutex_unlock(&rtc_lock);
 			return -EFAULT;
 		}
 

arch/cris/arch-v32/drivers/pcf8563.c

diff --git a/arch/cris/arch-v32/drivers/pcf8563.c b/arch/cris/arch-v32/drivers/pcf8563.c
index 53db387..f263ab5 100644
--- a/arch/cris/arch-v32/drivers/pcf8563.c
+++ b/arch/cris/arch-v32/drivers/pcf8563.c
@@ -229,7 +229,7 @@
 
 		if (copy_to_user((struct rtc_time *) arg, &tm,
 				 sizeof tm)) {
-			spin_unlock(&rtc_lock);
+			mutex_unlock(&rtc_lock);
 			return -EFAULT;
 		}