PM / devfreq: Fix memory leak when fail to register device

When the devfreq_add_device fails to register deivce, the memory
leak of devfreq instance happen. So, this patch fix the memory
leak issue. Before freeing the devfreq instance checks whether
devfreq instance is NULL or not because the device_unregister()
frees the devfreq instance when jumping to the 'err_init'.
It is to prevent the duplicate the kfee(devfreq).

Change-Id: Ic594e6729984fd7227a7efda50db600a6bf1be79
Cc: stable@vger.kernel.org
Fixes: ac4b281176a5 ("PM / devfreq: fix duplicated kfree on devfreq pointer")
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Myungjoo Ham <myungjoo.ham@samsung.com>

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 4aa72b5ed660edba50576080c6434b536ee43afb..fb0797b85384ecec5a18875697b1e8c352a9eb37 100644 (file)
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -566,7 +566,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
        err = device_register(&devfreq->dev);
        if (err) {
                mutex_unlock(&devfreq->lock);
-               goto err_out;
+               goto err_dev;
        }
 
        devfreq->trans_table =  devm_kzalloc(&devfreq->dev,
@@ -612,6 +612,9 @@ err_init:
        mutex_unlock(&devfreq_list_lock);
 
        device_unregister(&devfreq->dev);
+err_dev:
+       if (devfreq)
+               kfree(devfreq);
 err_out:
        return ERR_PTR(err);
 }