]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mfd: Fix wrong wm8350-core kfree in error path
authorAxel Lin <axel.lin@gmail.com>
Wed, 4 Aug 2010 01:54:21 +0000 (09:54 +0800)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 12 Aug 2010 09:28:08 +0000 (11:28 +0200)
This patch includes below fixes:
1. fix wm8350_create_cache error path
   make sure wm8350->reg_cache is freed in error path.
2. fix wm8350_device_init error path
   no need to kfree(wm8350->reg_cache) in the case of goto out.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/wm8350-core.c

index b5807484b4c92424e04b7232c5ab41b3b020db95..e81cc31e42020a8ceff6620d73b3f251ca6aeffd 100644 (file)
@@ -536,6 +536,7 @@ static int wm8350_create_cache(struct wm8350 *wm8350, int type, int mode)
        }
 
 out:
+       kfree(wm8350->reg_cache);
        return ret;
 }
 
@@ -700,7 +701,7 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
        ret = wm8350_irq_init(wm8350, irq, pdata);
        if (ret < 0)
-               goto err;
+               goto err_free;
 
        if (wm8350->irq_base) {
                ret = request_threaded_irq(wm8350->irq_base +
@@ -738,8 +739,9 @@ int wm8350_device_init(struct wm8350 *wm8350, int irq,
 
 err_irq:
        wm8350_irq_exit(wm8350);
-err:
+err_free:
        kfree(wm8350->reg_cache);
+err:
        return ret;
 }
 EXPORT_SYMBOL_GPL(wm8350_device_init);