Merge branch 'for-3.1' into for-3.2

broonie · broonie · commit cc2115cbfc63 · 2011-09-16T00:54:25.000+01:00
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ static int snd_ad73311_configure(void)`
`128`	`128`	`return 0;`
`129`	`129`	`}`
`130`	`130`
`131`		`-static int bf5xx_probe(struct platform_device *pdev)`
	`131`	`+static int bf5xx_probe(struct snd_soc_card *card)`
`132`	`132`	`{`
`133`	`133`	`int err;`
`134`	`134`	`if (gpio_request(GPIO_SE, "AD73311_SE")) {`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)`
`424`	`424`	`if (!priv->mem) {`
`425`	`425`	`dev_err(&pdev->dev, "request_mem_region failed\n");`
`426`	`426`	`err = -EBUSY;`
`427`		`- goto error_alloc;`
	`427`	`+ goto err_alloc;`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`priv->io = ioremap(priv->mem->start, SZ_16K);`