aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson2017-11-05 23:27:41 -0600
committerGreg Kroah-Hartman2018-02-22 08:44:58 -0600
commit8bb3fe364f8a77a2cc231e5861fc6b0322651df0 (patch)
tree09d609e9ac2e77ee7f03f3b6cbd4e1c54f51d6f8
parent5b6e767562c12257b47cf702d74788085d3fbe42 (diff)
downloadkernel-omap-8bb3fe364f8a77a2cc231e5861fc6b0322651df0.tar.gz
kernel-omap-8bb3fe364f8a77a2cc231e5861fc6b0322651df0.tar.xz
kernel-omap-8bb3fe364f8a77a2cc231e5861fc6b0322651df0.zip
PM / devfreq: Propagate error from devfreq_add_device()
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 device") Cc: stable@vger.kernel.org Acked-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/devfreq/devfreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index ca848cc6a8fd..4f6fc1cfd7da 100644
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -583,7 +583,7 @@ struct devfreq *devm_devfreq_add_device(struct device *dev,
583 devfreq = devfreq_add_device(dev, profile, governor_name, data); 583 devfreq = devfreq_add_device(dev, profile, governor_name, data);
584 if (IS_ERR(devfreq)) { 584 if (IS_ERR(devfreq)) {
585 devres_free(ptr); 585 devres_free(ptr);
586 return ERR_PTR(-ENOMEM); 586 return devfreq;
587 } 587 }
588 588
589 *ptr = devfreq; 589 *ptr = devfreq;