Browse Source

Merge branch 'pcf8563_mutex_spinlock' into cris

Jesper Nilsson 17 years ago
parent
commit
53e43d014c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/cris/arch-v10/drivers/pcf8563.c
  2. 1 1
      arch/cris/arch-v32/drivers/pcf8563.c

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

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