Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 53e43d014c
2 changed files with 2 additions and 2 deletions
arch/cris
arch-v10/drivers
pcf8563.c
arch-v32/drivers
pcf8563.c

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