diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:26 +0100 |
| commit | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (patch) | |
| tree | 9eb9d429a88d2301667198e30842502556b715f2 /sound/drivers/pcsp/pcsp.c | |
| parent | e4456e71618ec2c98084c15824d93e997955b60c (diff) | |
| parent | ebef7cfc81942686a994ca6239b195040f5d1e4d (diff) | |
| download | op-kernel-dev-86b3aa390b4b9925f16a21b98441fd7abdb9fff2.zip op-kernel-dev-86b3aa390b4b9925f16a21b98441fd7abdb9fff2.tar.gz | |
Merge branch 'topic/ca0106' into to-push
Diffstat (limited to 'sound/drivers/pcsp/pcsp.c')
| -rw-r--r-- | sound/drivers/pcsp/pcsp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 1899cf0..2a02f70 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/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_SOFTIRQ; + 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); @@ -188,10 +188,8 @@ static int __devexit pcsp_remove(struct platform_device *dev) static void pcsp_stop_beep(struct snd_pcsp *chip) { - spin_lock_irq(&chip->substream_lock); - if (!chip->playback_substream) - pcspkr_stop_sound(); - spin_unlock_irq(&chip->substream_lock); + pcsp_sync_stop(chip); + pcspkr_stop_sound(); } #ifdef CONFIG_PM |
