mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 20:53:53 +08:00
Merge branch 'for-3.1' into for-3.2
This commit is contained in:
commit
11323e3283
@ -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,
|
||||
},
|
||||
};
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user