From 3c55e0e19b71483f20604966dcdc6dc765c9a436 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 19 Nov 2008 17:10:55 +0000 Subject: 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 Cc: Tim Niemeyer Cc: Graeme Gregory Cc: Mark Brown Signed-off-by: Mark Brown --- sound/soc/s3c24xx/neo1973_wm8753.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sound') diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 5cbbe988e1f..4ac2aae5ca0 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -698,9 +698,10 @@ static int __init neo1973_init(void) } 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; } -- cgit v1.2.3