diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:34 -0700 |
| commit | 6b3a7c0f8a030561cb4eb5e905149938575e8085 (patch) | |
| tree | 5730e211e047256bf00e332855ca82844bb66b05 /sound/oss/sound_timer.c | |
| parent | 45b5bed7bc02a7f04127ac32f8fe7117b6baa419 (diff) | |
| parent | 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 (diff) | |
| download | linux-6b3a7c0f8a030561cb4eb5e905149938575e8085.tar.gz | |
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: pcm: add more format names
sound: oss: fix uninitialized spinlock
ALSA: asihpi - Return hw error directly from oustream_write.
ASoC: soc-core: fix debugfs_pop_time file permissions
ALSA: hda - Add Sony VAIO quirk for ALC269
Diffstat (limited to 'sound/oss/sound_timer.c')
| -rw-r--r-- | sound/oss/sound_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c index f0f0c19fbff7..48cda6c4c257 100644 --- a/sound/oss/sound_timer.c +++ b/sound/oss/sound_timer.c @@ -26,7 +26,7 @@ static unsigned long prev_event_time; static volatile unsigned long usecs_per_tmr; /* Length of the current interval */ static struct sound_lowlev_timer *tmr; -static spinlock_t lock; +static DEFINE_SPINLOCK(lock); static unsigned long tmr2ticks(int tmr_value) { |