Merge branch 'for-3.1' into for-3.2

cc2115cb · Mark Brown · f998f257 · 4f6c7e15 · cc2115cb · cc2115cb
Commit cc2115cb authored Sep 16, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/blackfin/bf5xx-ad73311.c sound/soc/blackfin/bf5xx-ad73311.c +1 -1

sound/soc/kirkwood/kirkwood-i2s.c sound/soc/kirkwood/kirkwood-i2s.c +1 -1

No files found.
--- 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")) {

--- 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);