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

Commit 989db200 authored Nov 06, 2010 by Mark Brown

Merge branch 'for-2.6.37' into for-2.6.38

parents c046fd4d 197ebd40

sound/soc/codecs/wm8776.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,6 @@
	/* codec private data */		/* codec private data */
	struct wm8776_priv {		struct wm8776_priv {
	enum snd_soc_control_type control_type;		enum snd_soc_control_type control_type;
	u16 reg_cache[WM8776_CACHEREGNUM];
	int sysclk[2];		int sysclk[2];
	};		};

sound/soc/pxa/corgi.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -102,8 +102,13 @@ static int corgi_startup(struct snd_pcm_substream *substream)
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct snd_soc_codec *codec = rtd->codec;		struct snd_soc_codec *codec = rtd->codec;

			mutex_lock(&codec->mutex);

	/* check the jack status at stream startup */		/* check the jack status at stream startup */
	corgi_ext_control(codec);		corgi_ext_control(codec);

			mutex_unlock(&codec->mutex);

	return 0;		return 0;
	}		}

sound/soc/pxa/magician.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -74,9 +74,13 @@ static int magician_startup(struct snd_pcm_substream *substream)
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct snd_soc_codec *codec = rtd->codec;		struct snd_soc_codec *codec = rtd->codec;

			mutex_lock(&codec->mutex);

	/* check the jack status at stream startup */		/* check the jack status at stream startup */
	magician_ext_control(codec);		magician_ext_control(codec);

			mutex_unlock(&codec->mutex);

	return 0;		return 0;
	}		}

sound/soc/pxa/poodle.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -79,8 +79,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct snd_soc_codec *codec = rtd->codec;		struct snd_soc_codec *codec = rtd->codec;

			mutex_lock(&codec->mutex);

	/* check the jack status at stream startup */		/* check the jack status at stream startup */
	poodle_ext_control(codec);		poodle_ext_control(codec);

			mutex_unlock(&codec->mutex);

	return 0;		return 0;
	}		}

sound/soc/pxa/spitz.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -110,8 +110,13 @@ static int spitz_startup(struct snd_pcm_substream *substream)
	struct snd_soc_pcm_runtime *rtd = substream->private_data;		struct snd_soc_pcm_runtime *rtd = substream->private_data;
	struct snd_soc_codec *codec = rtd->codec;		struct snd_soc_codec *codec = rtd->codec;

			mutex_lock(&codec->mutex);

	/* check the jack status at stream startup */		/* check the jack status at stream startup */
	spitz_ext_control(codec);		spitz_ext_control(codec);

			mutex_unlock(&codec->mutex);

	return 0;		return 0;
	}		}