Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2115cb authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents f998f257 4f6c7e15

sound/soc/blackfin/bf5xx-ad73311.c

+1 −1
Original line number Diff line number Diff line
@@ -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")) {

sound/soc/kirkwood/kirkwood-i2s.c

+1 −1
Original line number Diff line number Diff line
@@ -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);