dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'for-2.6.29' into for-2.6.30

This commit is contained in:
Mark Brown 2009-02-02 12:46:51 +00:00
parent 8f00806294 21dff43456
commit e50a7ea0eb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/omap/omap-pcm.c
View File

@ -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;
}