sound: ASoC: Fix an error path in neo1973_wm8753

[linux-2.6-omap-h63xx.git] / sound / soc / s3c24xx / neo1973_wm8753.c

diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 4d7a9aa15f1a8cc20f41d390f5a0f87bcb35dcaf..3aa441f19ae7d800e584731f293ca77b100af066 100644 (file)
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -24,14 +24,13 @@
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 
-#include <asm/mach-types.h>
 #include <asm/hardware/scoop.h>
-#include <asm/arch/regs-clock.h>
-#include <asm/arch/regs-gpio.h>
-#include <asm/hardware.h>
-#include <asm/arch/audio.h>
+#include <mach/regs-clock.h>
+#include <mach/regs-gpio.h>
+#include <mach/hardware.h>
+#include <mach/audio.h>
 #include <linux/io.h>
-#include <asm/arch/spi-gpio.h>
+#include <mach/spi-gpio.h>
 
 #include <asm/plat-s3c24xx/regs-iis.h>
 
@@ -718,12 +717,16 @@ static int __init neo1973_init(void)
        neo1973_snd_devdata.dev = &neo1973_snd_device->dev;
        ret = platform_device_add(neo1973_snd_device);
 
-       if (ret)
+       if (ret) {
                platform_device_put(neo1973_snd_device);
+               return ret;
+       }
 
        ret = i2c_add_driver(&lm4857_i2c_driver);
-       if (ret != 0)
+       if (ret != 0) {
                printk(KERN_ERR "can't add i2c driver");
+               platform_device_unregister(neo1973_snd_device);
+       }
 
        return ret;
 }