summaryrefslogtreecommitdiffstats
path: root/sound/soc/s3c24xx
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-09-01 17:44:05 +0200
committerJaroslav Kysela <perex@perex.cz>2008-09-09 09:11:07 +0200
commitd280289e799dcdf5913e8935bffe136d7594e26d (patch)
treee9fd22eb177d971895093583a70ef6e54db1f899 /sound/soc/s3c24xx
parentsound: remove reference to dead sound OSS vars AEDSP16_MSS and SBPRO (diff)
downloadlinux-d280289e799dcdf5913e8935bffe136d7594e26d.tar.xz
linux-d280289e799dcdf5913e8935bffe136d7594e26d.zip
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 <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: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r--sound/soc/s3c24xx/neo1973_wm8753.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index 8089f8ee05c0..3aa441f19ae7 100644
--- 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;
}