diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 16:49:36 -0500 |
| commit | 2cfcadde83b308240690ff1c18f117d8bc7a08b0 (patch) | |
| tree | aa0795966d070d1f7a5221232d9ba47744bddb5f /sound/oss/dmasound/dmasound_core.c | |
| parent | e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8'
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 793b7f478433..3f3c3f71db4b 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 | { |