diff --git a/[refs] b/[refs]
index 81b9fdd6d325..3ea5eb6c9685 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11843ee4d5ee130b84de01c019dde7bf0a3eca78
+refs/heads/master: 8a75f4fb28766878893b4335f4b5743ce9b931fe
diff --git a/trunk/sound/drivers/pcsp/pcsp.c b/trunk/sound/drivers/pcsp/pcsp.c
index 87219bf0a35e..2a02f704f366 100644
--- a/trunk/sound/drivers/pcsp/pcsp.c
+++ b/trunk/sound/drivers/pcsp/pcsp.c
@@ -96,7 +96,7 @@ static int __devinit snd_card_pcsp_probe(int devnum, struct device *dev)
 		return -EINVAL;
 
 	hrtimer_init(&pcsp_chip.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-	pcsp_chip.timer.cb_mode = HRTIMER_CB_IRQSAFE;
+	pcsp_chip.timer.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
 	pcsp_chip.timer.function = pcsp_do_timer;
 
 	card = snd_card_new(index, id, THIS_MODULE, 0);