diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 11:17:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 11:17:24 +0000 |
| commit | 2c54c1586c78775cfdfb071e68b27e14b668921f (patch) | |
| tree | cf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/ep93xx | |
| parent | b26bb71f610f9b346203bff407e4278d98f9fe80 (diff) | |
| parent | 8b6b30ab665d3bbb23180c39f6215e6f64516ed0 (diff) | |
| download | lwn-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.gz lwn-2c54c1586c78775cfdfb071e68b27e14b668921f.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/ep93xx')
| -rw-r--r-- | sound/soc/ep93xx/simone.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sound/soc/ep93xx/simone.c b/sound/soc/ep93xx/simone.c index 4b0d19913728..286817946c56 100644 --- a/sound/soc/ep93xx/simone.c +++ b/sound/soc/ep93xx/simone.c @@ -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; } |