adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/asoc' into for-linus

Browse source
This commit is contained in:
Takashi Iwai 2009-02-04 18:19:11 +01:00
commit 7df0eb424d
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/atmel/atmel_ssc_dai.c
View file

@ -10,7 +10,7 @@
* Based on at91-ssc.c by * Based on at91-ssc.c by
* Frank Mandarino <fmandarino@endrelia.com> * Frank Mandarino <fmandarino@endrelia.com>
* Based on pxa2xx Platform drivers by * Based on pxa2xx Platform drivers by
* Liam Girdwood <liam.girdwood@wolfsonmicro.com> * Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
sound/soc/atmel/atmel_ssc_dai.h
View file

@ -10,7 +10,7 @@
* Based on at91-ssc.c by * Based on at91-ssc.c by
* Frank Mandarino <fmandarino@endrelia.com> * Frank Mandarino <fmandarino@endrelia.com>
* Based on pxa2xx Platform drivers by * Based on pxa2xx Platform drivers by
* Liam Girdwood <liam.girdwood@wolfsonmicro.com> * Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
sound/soc/codecs/wm8350.c
View file

@ -3,7 +3,7 @@
* *
* Copyright (C) 2007, 2008 Wolfson Microelectronics PLC. * Copyright (C) 2007, 2008 Wolfson Microelectronics PLC.
* *
* Author: Liam Girdwood <lg@opensource.wolfsonmicro.com> * Author: Liam Girdwood <lrg@slimlogic.co.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as

3
sound/soc/codecs/wm8990.c
View file

@ -2,8 +2,7 @@
* wm8990.c -- WM8990 ALSA Soc Audio driver * wm8990.c -- WM8990 ALSA Soc Audio driver
* *
* Copyright 2008 Wolfson Microelectronics PLC. * Copyright 2008 Wolfson Microelectronics PLC.
* Author: Liam Girdwood * Author: Liam Girdwood <lrg@slimlogic.co.uk>
* lg@opensource.wolfsonmicro.com or linux@wolfsonmicro.com
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the

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 snd_pcm_runtime *runtime = substream->runtime;
struct omap_runtime_data *prtd = runtime->private_data; struct omap_runtime_data *prtd = runtime->private_data;
unsigned long flags;
int ret = 0; int ret = 0;
spin_lock_irq(&prtd->lock); spin_lock_irqsave(&prtd->lock, flags);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_RESUME:
@ -195,7 +196,7 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
default: default:
ret = -EINVAL; ret = -EINVAL;
} }
spin_unlock_irq(&prtd->lock); spin_unlock_irqrestore(&prtd->lock, flags);
return ret; return ret;
} }