3.18-stable review patch.  If anyone has any objections, please let me know.


From: Bjorn Andersson <bjorn.anders...@linaro.org>

commit d1bf2d30728f310f72296b54f0651ecdb09cbb12 upstream.

Propagate the error of devfreq_add_device() in devm_devfreq_add_device()
rather than statically returning ENOMEM. This makes it slightly faster
to pinpoint the cause of a returned error.

Fixes: 8cd84092d35e ("PM / devfreq: Add resource-managed function for devfreq 
Cc: sta...@vger.kernel.org
Acked-by: Chanwoo Choi <cw00.c...@samsung.com>
Signed-off-by: Bjorn Andersson <bjorn.anders...@linaro.org>
Signed-off-by: MyungJoo Ham <myungjoo....@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

 drivers/devfreq/devfreq.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -585,7 +585,7 @@ struct devfreq *devm_devfreq_add_device(
        devfreq = devfreq_add_device(dev, profile, governor_name, data);
        if (IS_ERR(devfreq)) {
-               return ERR_PTR(-ENOMEM);
+               return devfreq;
        *ptr = devfreq;

Reply via email to