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

Commit 2c54c158 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents b26bb71f 8b6b30ab

sound/soc/atmel/sam9g20_wm8731.c

+4 −1
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ static int __init at91sam9g20ek_init(void) 
	if (!at91sam9g20ek_snd_device) {

		printk(KERN_ERR "ASoC: Platform device allocation failed\n");

		ret = -ENOMEM;

		goto err_mclk;

	}



	platform_set_drvdata(at91sam9g20ek_snd_device,
@@ -248,11 +249,13 @@ static int __init at91sam9g20ek_init(void) 
	ret = platform_device_add(at91sam9g20ek_snd_device);

	if (ret) {

		printk(KERN_ERR "ASoC: Platform device allocation failed\n");

		platform_device_put(at91sam9g20ek_snd_device);

		goto err_device_add;

	}



	return ret;



err_device_add:

	platform_device_put(at91sam9g20ek_snd_device);

err_mclk:

	clk_put(mclk);

	mclk = NULL;

sound/soc/atmel/snd-soc-afeb9260.c

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ static int __init afeb9260_soc_init(void) 


	return 0;

err1:

	platform_device_del(afeb9260_snd_device);

	platform_device_put(afeb9260_snd_device);

	return err;

}

sound/soc/davinci/davinci-vcif.c

+3 −0
Original line number Diff line number Diff line
@@ -247,7 +247,10 @@ fail: 


static int davinci_vcif_remove(struct platform_device *pdev)

{

	struct davinci_vcif_dev *davinci_vcif_dev = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_dai(&pdev->dev);

	kfree(davinci_vcif_dev);



	return 0;

}

sound/soc/ep93xx/simone.c

+10 −8
Original line number Diff line number Diff line
@@ -54,24 +54,26 @@ static int __init simone_init(void) 


	ret = platform_device_add(simone_snd_ac97_device);

	if (ret)

		goto fail;

		goto fail1;



	simone_snd_device = platform_device_alloc("soc-audio", -1);

	if (!simone_snd_device) {

		ret = -ENOMEM;

		goto fail;

		goto fail2;

	}



	platform_set_drvdata(simone_snd_device, &snd_soc_simone);

	ret = platform_device_add(simone_snd_device);

	if (ret) {

		platform_device_put(simone_snd_device);

		goto fail;

	}

	if (ret)

		goto fail3;



	return ret;

	return 0;



fail:

fail3:

	platform_device_put(simone_snd_device);

fail2:

	platform_device_del(simone_snd_ac97_device);

fail1:

	platform_device_put(simone_snd_ac97_device);

	return ret;

}

sound/soc/fsl/efika-audio-fabric.c

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ static __init int efika_fabric_init(void) 
	rc = platform_device_add(pdev);

	if (rc) {

		pr_err("efika_fabric_init: platform_device_add() failed\n");

		platform_device_put(pdev);

		return -ENODEV;

	}

	return 0;