diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-25 06:55:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-25 06:55:48 -0700 |
| commit | ca83a55c9fe20b45a26101853a772e08aff90dcb (patch) | |
| tree | aa597c32d9a4062616cfdf38abb668c1758fc843 /sound/drivers/dummy.c | |
| parent | 9a949a98596c45763299158b9018f3491e3cbf99 (diff) | |
| parent | d5dbbe6569481bf12dcbe3e12cff72c5f78d272c (diff) | |
Merge tag 'sound-4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Again pretty calm weeks: we've had only a few trivial / stable
HD-audio fixes in addition to a possible race fix for snd-dummy driver
spotted by syzkaller"
* tag 'sound-4.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: dummy: Fix a use-after-free at closing
ALSA: hda / realtek - add two more Thinkpad IDs (5050,5053) for tpt460 fixup
ALSA: hda - Fix the headset mic jack detection on Dell machine
ALSA: hda/tegra: iomem fixups for sparse warnings
ALSA: hdac_regmap - fix the register access for runtime PM
Diffstat (limited to 'sound/drivers/dummy.c')
| -rw-r--r-- | sound/drivers/dummy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index c0f8f613f1f1b..172dacd925f57 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -420,6 +420,7 @@ static int dummy_hrtimer_stop(struct snd_pcm_substream *substream) static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm) { + hrtimer_cancel(&dpcm->timer); tasklet_kill(&dpcm->tasklet); } |