diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-02 12:46:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-02-02 12:46:51 +0000 |
| commit | e50a7ea0eba4f336b78b737e5ce48fba691c4919 (patch) | |
| tree | 1f9d4eddd1afdbb96ae2eba09238cdb55ed0f5e8 /sound/soc/omap | |
| parent | 8f008062943c8565e855dda8a6681f641d7e71f9 (diff) | |
| parent | 21dff4345697ad129b0efeed1b4d0aa53dfd47fe (diff) | |
Merge branch 'for-2.6.29' into for-2.6.30
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 607a38c7ae4..8e1431cb46b 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -175,9 +175,10 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *runtime = substream->runtime; struct omap_runtime_data *prtd = runtime->private_data; + unsigned long flags; int ret = 0; - spin_lock_irq(&prtd->lock); + spin_lock_irqsave(&prtd->lock, flags); switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: @@ -195,7 +196,7 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) default: ret = -EINVAL; } - spin_unlock_irq(&prtd->lock); + spin_unlock_irqrestore(&prtd->lock, flags); return ret; } |