diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 21:13:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-05 21:13:31 -0400 |
| commit | 11323e328336d21aafd7e814f337c20bb1cabd83 (patch) | |
| tree | 7c4961021b9fe22cbe7a1404299a859c182ccf7d /sound/soc | |
| parent | 4ed0d012c945af332ede1f9853db5184b6c24da1 (diff) | |
| parent | c5d2e650bd805a00ff9af537d5b5dede598a198c (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad193x.c | 4 | ||||
| -rw-r--r-- | sound/soc/soc-jack.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index a118a0fb9d81..5956584ea3a4 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c | |||
| @@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { | |||
| 103 | .cpu_dai_name = "bfin-tdm.0", | 103 | .cpu_dai_name = "bfin-tdm.0", |
| 104 | .codec_dai_name ="ad193x-hifi", | 104 | .codec_dai_name ="ad193x-hifi", |
| 105 | .platform_name = "bfin-tdm-pcm-audio", | 105 | .platform_name = "bfin-tdm-pcm-audio", |
| 106 | .codec_name = "ad193x.5", | 106 | .codec_name = "spi0.5", |
| 107 | .ops = &bf5xx_ad193x_ops, | 107 | .ops = &bf5xx_ad193x_ops, |
| 108 | }, | 108 | }, |
| 109 | { | 109 | { |
| @@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = { | |||
| 112 | .cpu_dai_name = "bfin-tdm.1", | 112 | .cpu_dai_name = "bfin-tdm.1", |
| 113 | .codec_dai_name ="ad193x-hifi", | 113 | .codec_dai_name ="ad193x-hifi", |
| 114 | .platform_name = "bfin-tdm-pcm-audio", | 114 | .platform_name = "bfin-tdm-pcm-audio", |
| 115 | .codec_name = "ad193x.5", | 115 | .codec_name = "spi0.5", |
| 116 | .ops = &bf5xx_ad193x_ops, | 116 | .ops = &bf5xx_ad193x_ops, |
| 117 | }, | 117 | }, |
| 118 | }; | 118 | }; |
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 38b00131b2fe..fa31d9c2abd8 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c | |||
| @@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) | |||
| 105 | 105 | ||
| 106 | snd_soc_dapm_sync(dapm); | 106 | snd_soc_dapm_sync(dapm); |
| 107 | 107 | ||
| 108 | snd_jack_report(jack->jack, status); | 108 | snd_jack_report(jack->jack, jack->status); |
| 109 | 109 | ||
| 110 | out: | 110 | out: |
| 111 | mutex_unlock(&codec->mutex); | 111 | mutex_unlock(&codec->mutex); |