diff --git a/[refs] b/[refs] index 0f0e68fec5a1..8a823d5cc189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f +refs/heads/master: b26bb71f610f9b346203bff407e4278d98f9fe80 diff --git a/trunk/sound/soc/samsung/smdk_wm9713.c b/trunk/sound/soc/samsung/smdk_wm9713.c index 7ce243086e7d..238cb3a38c5d 100644 --- a/trunk/sound/soc/samsung/smdk_wm9713.c +++ b/trunk/sound/soc/samsung/smdk_wm9713.c @@ -70,24 +70,27 @@ static int __init smdk_init(void) ret = platform_device_add(smdk_snd_wm9713_device); if (ret) - goto err; + goto err1; smdk_snd_ac97_device = platform_device_alloc("soc-audio", -1); if (!smdk_snd_ac97_device) { ret = -ENOMEM; - goto err; + goto err2; } platform_set_drvdata(smdk_snd_ac97_device, &smdk); ret = platform_device_add(smdk_snd_ac97_device); - if (ret) { - platform_device_put(smdk_snd_ac97_device); - goto err; - } + if (ret) + goto err3; return 0; -err: + +err3: + platform_device_put(smdk_snd_ac97_device); +err2: + platform_device_del(smdk_snd_wm9713_device); +err1: platform_device_put(smdk_snd_wm9713_device); return ret; }