2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
index a930005d5a3a..2458a741ad45 100644
--- a/drivers/cpuidle/driver.c
+++ b/drivers/cpuidle/driver.c
@@ -338,10 +338,11 @@ struct cpuidle_driver *cpuidle_driver_ref(void)
  */
 void cpuidle_driver_unref(void)
 {
-        struct cpuidle_driver *drv = cpuidle_get_driver();
+        struct cpuidle_driver *drv;
 
         spin_lock(&cpuidle_driver_lock);
 
+        drv = cpuidle_get_driver();
         if (drv && !WARN_ON(drv->refcnt <= 0))
                 drv->refcnt--;
 
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 8739cc05228c..a0223933536e 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -52,9 +52,10 @@ static ssize_t show_current_driver(struct device *dev,
                                    char *buf)
 {
         ssize_t ret;
-        struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
+        struct cpuidle_driver *cpuidle_driver;
 
         spin_lock(&cpuidle_driver_lock);
+        cpuidle_driver = cpuidle_get_driver();
         if (cpuidle_driver)
                 ret = sprintf(buf, "%s\n", cpuidle_driver->name);
         else