summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-11-06 23:41:29 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-07 09:44:52 +0100
commit70edc800a39327174d3244f9226ce8cacd01dc91 (patch)
treebc31cc029d22da1b7a66b5e6c08a69861c0dbe01
parentsound: Use KERN_WARNING instead of KERN_WARN, which does not exist (diff)
downloadlinux-70edc800a39327174d3244f9226ce8cacd01dc91.tar.xz
linux-70edc800a39327174d3244f9226ce8cacd01dc91.zip
sound: Replace old style lock initializer
SPIN_LOCK_UNLOCKED is deprecated. Use __SPIN_LOCK_UNLOCKED instead. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/oss/dmasound/dmasound_core.c4
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;
* Mid level stuff
*/
-struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
+struct sound_settings dmasound = {
+ .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
+};
static inline void sound_silence(void)
{