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

ASoC: Improve diagnostics for AT91SAM9G20-EK probe 



We should display an error by default if we fail to register.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 22d22ee5

sound/soc/atmel/sam9g20_wm8731.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -273,6 +273,7 @@ static int __init at91sam9g20ek_init(void) 
	 */

	 */

	ssc = ssc_request(0);

	ssc = ssc_request(0);

	if (IS_ERR(ssc)) {

	if (IS_ERR(ssc)) {

		printk(KERN_ERR "ASoC: Failed to request SSC 0\n");

		ret = PTR_ERR(ssc);

		ret = PTR_ERR(ssc);

		ssc = NULL;

		ssc = NULL;

		goto err_ssc;

		goto err_ssc;
@@ -281,8 +282,7 @@ static int __init at91sam9g20ek_init(void) 




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

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

	if (!at91sam9g20ek_snd_device) {

	if (!at91sam9g20ek_snd_device) {

		printk(KERN_DEBUG

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

				"platform device allocation failed\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

	}

	}
@@ -292,8 +292,7 @@ static int __init at91sam9g20ek_init(void) 




	ret = platform_device_add(at91sam9g20ek_snd_device);

	ret = platform_device_add(at91sam9g20ek_snd_device);

	if (ret) {

	if (ret) {

		printk(KERN_DEBUG

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

				"platform device allocation failed\n");

		platform_device_put(at91sam9g20ek_snd_device);

		platform_device_put(at91sam9g20ek_snd_device);

	}

	}