Commit d280289e authored by Jean Delvare's avatar Jean Delvare Committed by Jaroslav Kysela

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: default avatarJean Delvare <khali@linux-fr.org>
Cc: Tim Niemeyer <reddog@mastersword.de>
Cc: Graeme Gregory <graeme@openmoko.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent dfdf34bb
...@@ -717,12 +717,16 @@ static int __init neo1973_init(void) ...@@ -717,12 +717,16 @@ static int __init neo1973_init(void)
neo1973_snd_devdata.dev = &neo1973_snd_device->dev; neo1973_snd_devdata.dev = &neo1973_snd_device->dev;
ret = platform_device_add(neo1973_snd_device); ret = platform_device_add(neo1973_snd_device);
if (ret) if (ret) {
platform_device_put(neo1973_snd_device); platform_device_put(neo1973_snd_device);
return ret;
}
ret = i2c_add_driver(&lm4857_i2c_driver); ret = i2c_add_driver(&lm4857_i2c_driver);
if (ret != 0) if (ret != 0) {
printk(KERN_ERR "can't add i2c driver"); printk(KERN_ERR "can't add i2c driver");
platform_device_unregister(neo1973_snd_device);
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment