|
@@ -1959,6 +1959,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
|
|
|
|
|
|
tu = file->private_data;
|
|
|
unit = tu->tread ? sizeof(struct snd_timer_tread) : sizeof(struct snd_timer_read);
|
|
|
+ mutex_lock(&tu->ioctl_lock);
|
|
|
spin_lock_irq(&tu->qlock);
|
|
|
while ((long)count - result >= unit) {
|
|
|
while (!tu->qused) {
|
|
@@ -1974,7 +1975,9 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
|
|
|
add_wait_queue(&tu->qchange_sleep, &wait);
|
|
|
|
|
|
spin_unlock_irq(&tu->qlock);
|
|
|
+ mutex_unlock(&tu->ioctl_lock);
|
|
|
schedule();
|
|
|
+ mutex_lock(&tu->ioctl_lock);
|
|
|
spin_lock_irq(&tu->qlock);
|
|
|
|
|
|
remove_wait_queue(&tu->qchange_sleep, &wait);
|
|
@@ -1994,7 +1997,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
|
|
|
tu->qused--;
|
|
|
spin_unlock_irq(&tu->qlock);
|
|
|
|
|
|
- mutex_lock(&tu->ioctl_lock);
|
|
|
if (tu->tread) {
|
|
|
if (copy_to_user(buffer, &tu->tqueue[qhead],
|
|
|
sizeof(struct snd_timer_tread)))
|
|
@@ -2004,7 +2006,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
|
|
|
sizeof(struct snd_timer_read)))
|
|
|
err = -EFAULT;
|
|
|
}
|
|
|
- mutex_unlock(&tu->ioctl_lock);
|
|
|
|
|
|
spin_lock_irq(&tu->qlock);
|
|
|
if (err < 0)
|
|
@@ -2014,6 +2015,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
|
|
|
}
|
|
|
_error:
|
|
|
spin_unlock_irq(&tu->qlock);
|
|
|
+ mutex_unlock(&tu->ioctl_lock);
|
|
|
return result > 0 ? result : err;
|
|
|
}
|
|
|
|