summaryrefslogtreecommitdiff
path: root/drivers/cpuidle/cpuidle-arm.c
diff options
context:
space:
mode:
authorSudeep Holla <Sudeep.Holla@arm.com>2018-06-18 15:34:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-06-25 09:33:34 +0200
commit818489e511a3a38d4c9c120675e0700608925800 (patch)
tree095fdbd8f97d1586e4b51c7ba9d27c715b3705e1 /drivers/cpuidle/cpuidle-arm.c
parent7daf201d7fe8334e2d2364d4e8ed3394ec9af819 (diff)
ARM: cpuidle: silence error on driver registration failure
It's perfectly fine to have multiple cpuidle driver compiled in the build configuration. However, it's not good to throw error on driver registration failure if some other driver is already initialised and assigned. In such cases, __cpuidle_register_driver returns -EBUSY and we can check for such error before throwing the error. Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpuidle/cpuidle-arm.c')
-rw-r--r--drivers/cpuidle/cpuidle-arm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index e07bc7ace774..073557f433eb 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -105,7 +105,8 @@ static int __init arm_idle_init_cpu(int cpu)
ret = cpuidle_register_driver(drv);
if (ret) {
- pr_err("Failed to register cpuidle driver\n");
+ if (ret != -EBUSY)
+ pr_err("Failed to register cpuidle driver\n");
goto out_kfree_drv;
}