mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-07 11:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pcf8563_mutex_spinlock' into cris

Browse Source
This commit is contained in:
Jesper Nilsson
2008-06-29 23:38:42 +02:00
parent dc1493aff0 9be48a94b8
commit 53e43d014c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/cris/arch-v10/drivers/pcf8563.c
View File

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

2
arch/cris/arch-v32/drivers/pcf8563.c
View File

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