Skip to content

L
linux-davinci
Commit 53e43d01 authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files
Options

Merge branch 'pcf8563_mutex_spinlock' into cris

parents dc1493af 9be48a94
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
arch/cris/arch-v10/drivers/pcf8563.c
View file @ 53e43d01
...@@ -233,7 +233,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, ...@@ -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, if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) { sizeof tm)) {
spin_unlock(&rtc_lock); mutex_unlock(&rtc_lock);
return -EFAULT; return -EFAULT;
} }
......
arch/cris/arch-v32/drivers/pcf8563.c
View file @ 53e43d01
...@@ -229,7 +229,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, ...@@ -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, if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) { sizeof tm)) {
spin_unlock(&rtc_lock); mutex_unlock(&rtc_lock);
return -EFAULT; return -EFAULT;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment