Merge branch 'pcf8563_mutex_spinlock' into cris

53e43d01 · Jesper Nilsson · dc1493af · 9be48a94 · 53e43d01 · 53e43d01
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

arch/cris/arch-v10/drivers/pcf8563.c arch/cris/arch-v10/drivers/pcf8563.c +1 -1

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

未找到文件。
--- 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;
 		}


--- 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;
 		}