Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Overwrite pin config on intel DG45ID board.
  intelhdmi - dont power off HDA link
  ALSA: hrtimer - Fix lock-up
  ALSA: intelhdmi - add channel mapping for typical configurations
  ALSA: intelhdmi - channel mapping applies to Pin
  ALSA: intelhdmi - accept DisplayPort pin
  ALSA: hda - show HBR(High Bit Rate) pin cap in procfs
  ALSA: hda - Fix LED GPIO setup for HP laptops with IDT codecs
  ASoC: Fix build of OMAP sound drivers
  ALSA: opti93x: fix irq releasing if the irq cannot be allocated

1 files changed, 13 insertions, 2 deletions

diff --git a/sound/core/hrtimer.c b/sound/core/hrtimer.c
index 34c7d48f506..7f4d744ae40 100644
--- a/sound/core/hrtimer.c
+++ b/sound/core/hrtimer.c
@@ -37,14 +37,22 @@ static unsigned int resolution;
 struct snd_hrtimer {
         struct snd_timer *timer;
         struct hrtimer hrt;
+        atomic_t running;
 };
 
 static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt)
 {
         struct snd_hrtimer *stime = container_of(hrt, struct snd_hrtimer, hrt);
         struct snd_timer *t = stime->timer;
+
+        if (!atomic_read(&stime->running))
+                return HRTIMER_NORESTART;
+
         hrtimer_forward_now(hrt, ns_to_ktime(t->sticks * resolution));
         snd_timer_interrupt(stime->timer, t->sticks);
+
+        if (!atomic_read(&stime->running))
+                return HRTIMER_NORESTART;
         return HRTIMER_RESTART;
 }
 
@@ -58,6 +66,7 @@ static int snd_hrtimer_open(struct snd_timer *t)
         hrtimer_init(&stime->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
         stime->timer = t;
         stime->hrt.function = snd_hrtimer_callback;
+        atomic_set(&stime->running, 0);
         t->private_data = stime;
         return 0;
 }
@@ -78,16 +87,18 @@ static int snd_hrtimer_start(struct snd_timer *t)
 {
         struct snd_hrtimer *stime = t->private_data;
 
+        atomic_set(&stime->running, 0);
+        hrtimer_cancel(&stime->hrt);
         hrtimer_start(&stime->hrt, ns_to_ktime(t->sticks * resolution),
                       HRTIMER_MODE_REL);
+        atomic_set(&stime->running, 1);
         return 0;
 }
 
 static int snd_hrtimer_stop(struct snd_timer *t)
 {
         struct snd_hrtimer *stime = t->private_data;
-
-        hrtimer_cancel(&stime->hrt);
+        atomic_set(&stime->running, 0);
         return 0;
 }