From 006fdcdb3ebee9d3badf2d0f68427e51088c72ff Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 2 Feb 2009 12:46:51 +0000 Subject: [PATCH] --- yaml --- r: 132817 b: refs/heads/master c: e50a7ea0eba4f336b78b737e5ce48fba691c4919 h: refs/heads/master i: 132815: 5ae5b466d5998f38ba6e58c178a21a127f77d22e v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-pcm.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d6f52f881c18..7806ec274e62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f008062943c8565e855dda8a6681f641d7e71f9 +refs/heads/master: e50a7ea0eba4f336b78b737e5ce48fba691c4919 diff --git a/trunk/sound/soc/omap/omap-pcm.c b/trunk/sound/soc/omap/omap-pcm.c index 607a38c7ae48..8e1431cb46bb 100644 --- a/trunk/sound/soc/omap/omap-pcm.c +++ b/trunk/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; }