diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-05-23 20:46:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-24 18:41:52 +0800 |
| commit | 2da658927c9e28425ecb6b6a7a03094a012e8620 (patch) | |
| tree | fef2c99cdea0c8678681560dac33265c9302f75b | |
| parent | 9478e0b60fb4a7adde72d4a86b826d396b607a61 (diff) | |
| download | op-kernel-dev-2da658927c9e28425ecb6b6a7a03094a012e8620.zip op-kernel-dev-2da658927c9e28425ecb6b6a7a03094a012e8620.tar.gz | |
ASoC: sh: fsi: make sure fsi_stream_push/pop access by spin lock
fsi_stream_push/pop might be called in same time.
This patch protect it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/sh/fsi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index a1081c7..a00fe37 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -394,7 +394,10 @@ static void fsi_stream_push(struct fsi_priv *fsi, { struct fsi_stream *io = fsi_get_stream(fsi, is_play); struct snd_pcm_runtime *runtime = substream->runtime; + struct fsi_master *master = fsi_get_master(fsi); + unsigned long flags; + spin_lock_irqsave(&master->lock, flags); io->substream = substream; io->buff_sample_capa = fsi_frame2sample(fsi, runtime->buffer_size); io->buff_sample_pos = 0; @@ -402,13 +405,17 @@ static void fsi_stream_push(struct fsi_priv *fsi, io->period_pos = 0; io->oerr_num = -1; /* ignore 1st err */ io->uerr_num = -1; /* ignore 1st err */ + spin_unlock_irqrestore(&master->lock, flags); } static void fsi_stream_pop(struct fsi_priv *fsi, int is_play) { struct fsi_stream *io = fsi_get_stream(fsi, is_play); struct snd_soc_dai *dai = fsi_get_dai(io->substream); + struct fsi_master *master = fsi_get_master(fsi); + unsigned long flags; + spin_lock_irqsave(&master->lock, flags); if (io->oerr_num > 0) dev_err(dai->dev, "over_run = %d\n", io->oerr_num); @@ -423,6 +430,7 @@ static void fsi_stream_pop(struct fsi_priv *fsi, int is_play) io->period_pos = 0; io->oerr_num = 0; io->uerr_num = 0; + spin_unlock_irqrestore(&master->lock, flags); } static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, int is_play) |
