sound: ASoC: Fix an error path in neo1973_wm8753

The error handling in neo1973_init is incorrect:

* If platform_device_add fails, we go on with the rest of the
  initialization instead of bailing out. Things will break when the
  module is removed (platform_device_unregister called on a device
  that wasn't registered.)

* If i2c_add_driver fails, we return an error so the module will not
  load, but we don't unregister neo1973_snd_device, so we are leaking
  resources.

Add the missing error handling.

Signed-off-by: Jean Delvare <[email protected]>
Cc: Tim Niemeyer <[email protected]>
Cc: Graeme Gregory <[email protected]>
Cc: Mark Brown <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Jaroslav Kysela <[email protected]>

diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 8089f8ee05c0413f2bf4ff7f9b365a26228a8895..3aa441f19ae7d800e584731f293ca77b100af066 100644 (file)
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -717,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;
 }