diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /sound/core/hrtimer.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'sound/core/hrtimer.c')
| -rw-r--r-- | sound/core/hrtimer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c index 7730575bfadd..07efa29dfd4a 100644 --- a/sound/core/hrtimer.c +++ b/sound/core/hrtimer.c | |||
| @@ -45,12 +45,13 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) | |||
| 45 | { | 45 | { |
| 46 | struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt); | 46 | struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt); |
| 47 | struct snd_timer *t = stime->timer; | 47 | struct snd_timer *t = stime->timer; |
| 48 | unsigned long oruns; | ||
| 48 | 49 | ||
| 49 | if (!atomic_read(&stime->running)) | 50 | if (!atomic_read(&stime->running)) |
| 50 | return HRTIMER_NORESTART; | 51 | return HRTIMER_NORESTART; |
| 51 | 52 | ||
| 52 | hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution)); | 53 | oruns = hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution)); |
| 53 | snd_timer_interrupt(stime->timer, t->sticks); | 54 | snd_timer_interrupt(stime->timer, t->sticks * oruns); |
| 54 | 55 | ||
| 55 | if (!atomic_read(&stime->running)) | 56 | if (!atomic_read(&stime->running)) |
| 56 | return HRTIMER_NORESTART; | 57 | return HRTIMER_NORESTART; |