diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-16 00:54:25 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-16 00:54:25 +0100 |
| commit | cc2115cbfc63da72890160da01608b3189dd1b74 (patch) | |
| tree | 6f178677ebeec498ee4c5765adb71e1f90da37c8 /sound/soc | |
| parent | f998f257c92216df314610dd5aebc5f5d23e6ec0 (diff) | |
| parent | 4f6c7e159361b330d767b107226bcc6938abad16 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad73311.c | 2 | ||||
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index 732a247f2527..b94eb7ef7d16 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c @@ -128,7 +128,7 @@ static int snd_ad73311_configure(void) return 0; } -static int bf5xx_probe(struct platform_device *pdev) +static int bf5xx_probe(struct snd_soc_card *card) { int err; if (gpio_request(GPIO_SE, "AD73311_SE")) { diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 8f16cd37c2af..d0bcf3fcea01 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) if (!priv->mem) { dev_err(&pdev->dev, "request_mem_region failed\n"); err = -EBUSY; - goto error_alloc; + goto err_alloc; } priv->io = ioremap(priv->mem->start, SZ_16K); |