1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 59d24e9cb8c5..c189b82f5ece 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -347,7 +347,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 if (!IS_ERR(devfreq)) {
                         dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__);
                         err = -EINVAL;
-                        goto out;
+                        goto err_out;
                 }
         }
 
@@ -356,7 +356,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
                 dev_err(dev, "%s: Unable to create devfreq for the device\n",
                         __func__);
                 err = -ENOMEM;
-                goto out;
+                goto err_out;
         }
 
         mutex_init(&devfreq->lock);
@@ -399,17 +399,16 @@ struct devfreq *devfreq_add_device(struct device *dev,
                                    devfreq->next_polling);
         }
         mutex_unlock(&devfreq_list_lock);
-        goto out;
+out:
+        return devfreq;
+
 err_init:
         device_unregister(&devfreq->dev);
 err_dev:
         mutex_unlock(&devfreq->lock);
         kfree(devfreq);
-out:
-        if (err)
-                return ERR_PTR(err);
-        else
-                return devfreq;
+err_out:
+        return ERR_PTR(err);
 }
 
 /**