diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /sound/oss/dmasound/dmasound_core.c | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/oss/dmasound/dmasound_core.c')
| -rw-r--r-- | sound/oss/dmasound/dmasound_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index 793b7f47843..3f3c3f71db4 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c | |||
| @@ -219,7 +219,9 @@ static int shared_resources_initialised; | |||
| 219 | * Mid level stuff | 219 | * Mid level stuff |
| 220 | */ | 220 | */ |
| 221 | 221 | ||
| 222 | struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED }; | 222 | struct sound_settings dmasound = { |
| 223 | .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock) | ||
| 224 | }; | ||
| 223 | 225 | ||
| 224 | static inline void sound_silence(void) | 226 | static inline void sound_silence(void) |
| 225 | { | 227 | { |