diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-29 14:59:05 +0200 |
| commit | b5f9a9d5113efe11a3b9dad600a6f833274da595 (patch) | |
| tree | 6db5fb34a2d590086e25f7f682fecb5f43e6b283 /drivers/media/pci/saa7134/saa7134-alsa.c | |
| parent | spi: Use dev_get_drvdata at appropriate places (diff) | |
| parent | spi: spi-rspi: fix inconsistent spin_lock_irqsave (diff) | |
| download | linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.tar.xz linux-b5f9a9d5113efe11a3b9dad600a6f833274da595.zip | |
Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
Conflicts:
drivers/spi/spi-rspi.c
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-alsa.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-alsa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c index 10460fd3ce39..dbcdfbf8aed0 100644 --- a/drivers/media/pci/saa7134/saa7134-alsa.c +++ b/drivers/media/pci/saa7134/saa7134-alsa.c @@ -172,7 +172,9 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, dprintk("irq: overrun [full=%d/%d] - Blocks in %d\n",dev->dmasound.read_count, dev->dmasound.bufsize, dev->dmasound.blocks); spin_unlock(&dev->slock); + snd_pcm_stream_lock(dev->dmasound.substream); snd_pcm_stop(dev->dmasound.substream,SNDRV_PCM_STATE_XRUN); + snd_pcm_stream_unlock(dev->dmasound.substream); return; } |