diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-29 21:38:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-29 21:38:37 +0100 |
| commit | da9a92f0cde9ce34a930d7edcaef30429e41d14a (patch) | |
| tree | 44095fbc8f83990330437d11c7a9fc699a5e2521 /sound/core/timer.c | |
| parent | aa6b4960f4571ecc422a13b2490e91f5debb64a1 (diff) | |
| parent | b0ba6b0a5eb2b51037a07dbf5a7470ca804d575c (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'sound/core/timer.c')
| -rw-r--r-- | sound/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c index a3f547badd38..637d034bb084 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1964,6 +1964,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, qhead = tu->qhead++; tu->qhead %= tu->queue_size; + tu->qused--; spin_unlock_irq(&tu->qlock); if (tu->tread) { @@ -1977,7 +1978,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, } spin_lock_irq(&tu->qlock); - tu->qused--; if (err < 0) goto _error; result += unit; |