diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 12:35:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-30 12:35:43 +0100 |
| commit | dfa7c70b04bb20df7936018c737014655bf92d09 (patch) | |
| tree | f5eb47ca770d70fe2d55006bc1a4e552b964c422 /sound/soc/s6000 | |
| parent | ASoC: Simplify pm860x_probe error handling (diff) | |
| parent | s6105-ipcam: fix compilation (diff) | |
| download | linux-dfa7c70b04bb20df7936018c737014655bf92d09.tar.xz linux-dfa7c70b04bb20df7936018c737014655bf92d09.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/s6000')
| -rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 2 | ||||
| -rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 2 | ||||
| -rw-r--r-- | sound/soc/s6000/s6105-ipcam.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 8778faa174a6..3052f64b2403 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c @@ -434,7 +434,7 @@ static struct snd_soc_dai_driver s6000_i2s_dai = { .rate_max = 1562500, }, .ops = &s6000_i2s_dai_ops, -} +}; static int __devinit s6000_i2s_probe(struct platform_device *pdev) { diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 271fd222bf19..ab3ccaec72d2 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c @@ -473,7 +473,7 @@ static int s6000_pcm_new(struct snd_card *card, } res = request_irq(params->irq, s6000_pcm_irq, IRQF_SHARED, - s6000_soc_platform.name, pcm); + "s6000-audio", pcm); if (res) { printk(KERN_ERR "s6000-pcm couldn't get IRQ\n"); return res; diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 2e977e4d65e7..bf3f3f9165e4 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c @@ -168,7 +168,7 @@ static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_sync(dapm); - snd_ctl_add(codec->snd_card, snd_ctl_new1(&audio_out_mux, codec)); + snd_ctl_add(codec->card->snd_card, snd_ctl_new1(&audio_out_mux, codec)); return 0; } |