diff --git a/[refs] b/[refs] index 51c07b0fbde0..7e8c380132e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0d9274cd888ada59fe2734f45019d84bc40ac3d +refs/heads/master: f1789f451d2ee18ff2bbc5afe78e1a7b9b714003 diff --git a/trunk/sound/isa/wss/wss_lib.c b/trunk/sound/isa/wss/wss_lib.c index f2df77bd1308..fff8a3b79fdf 100644 --- a/trunk/sound/isa/wss/wss_lib.c +++ b/trunk/sound/isa/wss/wss_lib.c @@ -1866,10 +1866,6 @@ int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm) if (err < 0) return err; - spin_lock_init(&chip->reg_lock); - mutex_init(&chip->mce_mutex); - mutex_init(&chip->open_mutex); - snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_wss_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_wss_capture_ops);