Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df0eb42 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents af7af690 64ca0404

sound/soc/atmel/atmel_ssc_dai.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * Based on at91-ssc.c by

 * Frank Mandarino <fmandarino@endrelia.com>

 * 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

 * it under the terms of the GNU General Public License as published by

sound/soc/atmel/atmel_ssc_dai.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * Based on at91-ssc.c by

 * Frank Mandarino <fmandarino@endrelia.com>

 * 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

 * it under the terms of the GNU General Public License as published by

sound/soc/codecs/wm8350.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * 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

 * it under the terms of the GNU General Public License version 2 as

sound/soc/codecs/wm8990.c

+1 −2
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
 * wm8990.c  --  WM8990 ALSA Soc Audio driver

 *

 * Copyright 2008 Wolfson Microelectronics PLC.

 * Author: Liam Girdwood

 *         lg@opensource.wolfsonmicro.com or linux@wolfsonmicro.com

 * Author: Liam Girdwood <lrg@slimlogic.co.uk>

 *

 *  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

sound/soc/omap/omap-pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

}