diff --git a/[refs] b/[refs]
index 6e42aa9c68d4..d66f7dc5231f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb9f76cd5909b9da6b4d31b55a4086cc35614fe0
+refs/heads/master: 1bc1f30565b561bafc51725fce336aec59029437
diff --git a/trunk/sound/drivers/pcsp/pcsp.c b/trunk/sound/drivers/pcsp/pcsp.c
index 547005cb0942..ac57e87d01bc 100644
--- a/trunk/sound/drivers/pcsp/pcsp.c
+++ b/trunk/sound/drivers/pcsp/pcsp.c
@@ -191,11 +191,10 @@ static int __devexit pcsp_remove(struct platform_device *dev)
 
 static void pcsp_stop_beep(struct snd_pcsp *chip)
 {
-	unsigned long flags;
-	spin_lock_irqsave(&chip->substream_lock, flags);
+	spin_lock_irq(&chip->substream_lock);
 	if (!chip->playback_substream)
 		pcspkr_stop_sound();
-	spin_unlock_irqrestore(&chip->substream_lock, flags);
+	spin_unlock_irq(&chip->substream_lock);
 }
 
 static int pcsp_suspend(struct platform_device *dev, pm_message_t state)
diff --git a/trunk/sound/drivers/pcsp/pcsp_lib.c b/trunk/sound/drivers/pcsp/pcsp_lib.c
index a302756eac7c..54253e9b4b02 100644
--- a/trunk/sound/drivers/pcsp/pcsp_lib.c
+++ b/trunk/sound/drivers/pcsp/pcsp_lib.c
@@ -305,7 +305,9 @@ static int snd_pcsp_playback_open(struct snd_pcm_substream *substream)
 		return -EBUSY;
 	}
 	runtime->hw = snd_pcsp_playback;
+	spin_lock_irq(&chip->substream_lock);
 	chip->playback_substream = substream;
+	spin_unlock_irq(&chip->substream_lock);
 	return 0;
 }