aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-16 08:38:11 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-02-18 06:25:21 -0500
commitd6943541158985030108e4a0a483cdadc3c80ee1 (patch)
treeafe92c786305ca21bfb173294d68a2057d58eae4 /sound
parent22d22ee5146ae823b1e93fe2887a7cba56015091 (diff)
ASoC: Improve diagnostics for AT91SAM9G20-EK probe
We should display an error by default if we fail to register. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 6ea04be911d0..be3f923d3c43 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -273,6 +273,7 @@ static int __init at91sam9g20ek_init(void)
273 */ 273 */
274 ssc = ssc_request(0); 274 ssc = ssc_request(0);
275 if (IS_ERR(ssc)) { 275 if (IS_ERR(ssc)) {
276 printk(KERN_ERR "ASoC: Failed to request SSC 0\n");
276 ret = PTR_ERR(ssc); 277 ret = PTR_ERR(ssc);
277 ssc = NULL; 278 ssc = NULL;
278 goto err_ssc; 279 goto err_ssc;
@@ -281,8 +282,7 @@ static int __init at91sam9g20ek_init(void)
281 282
282 at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1); 283 at91sam9g20ek_snd_device = platform_device_alloc("soc-audio", -1);
283 if (!at91sam9g20ek_snd_device) { 284 if (!at91sam9g20ek_snd_device) {
284 printk(KERN_DEBUG 285 printk(KERN_ERR "ASoC: Platform device allocation failed\n");
285 "platform device allocation failed\n");
286 ret = -ENOMEM; 286 ret = -ENOMEM;
287 } 287 }
288 288
@@ -292,8 +292,7 @@ static int __init at91sam9g20ek_init(void)
292 292
293 ret = platform_device_add(at91sam9g20ek_snd_device); 293 ret = platform_device_add(at91sam9g20ek_snd_device);
294 if (ret) { 294 if (ret) {
295 printk(KERN_DEBUG 295 printk(KERN_ERR "ASoC: Platform device allocation failed\n");
296 "platform device allocation failed\n");
297 platform_device_put(at91sam9g20ek_snd_device); 296 platform_device_put(at91sam9g20ek_snd_device);
298 } 297 }
299 298