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

Commit 11323e32 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 4ed0d012 c5d2e650

sound/soc/blackfin/bf5xx-ad193x.c

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.cpu_dai_name = "bfin-tdm.0",

		.codec_dai_name ="ad193x-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad193x.5",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

	},

	{
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { 
		.cpu_dai_name = "bfin-tdm.1",

		.codec_dai_name ="ad193x-hifi",

		.platform_name = "bfin-tdm-pcm-audio",

		.codec_name = "ad193x.5",

		.codec_name = "spi0.5",

		.ops = &bf5xx_ad193x_ops,

	},

};

sound/soc/soc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) 


	snd_soc_dapm_sync(dapm);



	snd_jack_report(jack->jack, status);

	snd_jack_report(jack->jack, jack->status);



out:

	mutex_unlock(&codec->mutex);