summaryrefslogtreecommitdiff
path: root/sound/soc/atmel
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-25 11:17:24 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-25 11:17:24 +0000
commit2c54c1586c78775cfdfb071e68b27e14b668921f (patch)
treecf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/atmel
parentb26bb71f610f9b346203bff407e4278d98f9fe80 (diff)
parent8b6b30ab665d3bbb23180c39f6215e6f64516ed0 (diff)
downloadlinux-3.10-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.gz
linux-3.10-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.bz2
linux-3.10-2c54c1586c78775cfdfb071e68b27e14b668921f.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/sam9g20_wm8731.c5
-rw-r--r--sound/soc/atmel/snd-soc-afeb9260.c1
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 1c9de19151f..af3c73053ee 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -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;
diff --git a/sound/soc/atmel/snd-soc-afeb9260.c b/sound/soc/atmel/snd-soc-afeb9260.c
index 1202f5e4894..da2208e06b0 100644
--- a/sound/soc/atmel/snd-soc-afeb9260.c
+++ b/sound/soc/atmel/snd-soc-afeb9260.c
@@ -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;
}