Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53e43d01 authored by Jesper Nilsson's avatar Jesper Nilsson
Browse files

Merge branch 'pcf8563_mutex_spinlock' into cris

parents dc1493af 9be48a94

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}