diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /sound/oss | |
| parent | ALSA: usb-audio: add BOSS ME-25 support (diff) | |
| parent | ALSA: usb-audio: fix detection of vendor-specific device protocol settings (diff) | |
| download | linux-dev-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.xz linux-dev-68885a3ff38ed51fa02f241feb405c9922a90ee0.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/oss')
| -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) { |