summaryrefslogtreecommitdiffstats
path: root/sound/core/timer.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-02 14:14:10 +0100
committerTakashi Iwai <tiwai@suse.de>2016-02-03 00:15:42 +0100
commitf146357f069e71aff8e474c625bcebcd3094b3ab (patch)
treed0240d85093b4f77e0b76b3c25396dd01bddb2e2 /sound/core/timer.c
parentf784beb75ce82f4136f8a0960d3ee872f7109e09 (diff)
downloadlinux-stable-f146357f069e71aff8e474c625bcebcd3094b3ab.tar.gz
linux-stable-f146357f069e71aff8e474c625bcebcd3094b3ab.tar.bz2
linux-stable-f146357f069e71aff8e474c625bcebcd3094b3ab.zip
ALSA: timer: Sync timer deletion at closing the system timer
ALSA timer core framework has no sync point at stopping because it's called inside the spinlock. Thus we need a sync point at close for avoiding the stray timer task. This is simply done by implementing the close callback just calling del_timer_sync(). (It's harmless to call it unconditionally, as the core timer itself cares of the already deleted timer instance.) Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/timer.c')
-rw-r--r--sound/core/timer.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 12db60dd147b..b419e612f987 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -1058,11 +1058,21 @@ static int snd_timer_s_stop(struct snd_timer * timer)
return 0;
}
+static int snd_timer_s_close(struct snd_timer *timer)
+{
+ struct snd_timer_system_private *priv;
+
+ priv = (struct snd_timer_system_private *)timer->private_data;
+ del_timer_sync(&priv->tlist);
+ return 0;
+}
+
static struct snd_timer_hardware snd_timer_system =
{
.flags = SNDRV_TIMER_HW_FIRST | SNDRV_TIMER_HW_TASKLET,
.resolution = 1000000000L / HZ,
.ticks = 10000000L,
+ .close = snd_timer_s_close,
.start = snd_timer_s_start,
.stop = snd_timer_s_stop
};