Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl', ...

[sfrench/cifs-2.6.git] / drivers / cpuidle / sysfs.c

diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 0ba9c8b8ee743e960eed3db8e5d9108d7c5eeadc..0310ffaec9df0536143b509847047d7ab01eba27 100644 (file)
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -47,10 +47,11 @@ static ssize_t show_current_driver(struct sysdev_class *class,
                                   char *buf)
 {
        ssize_t ret;
+       struct cpuidle_driver *cpuidle_driver = cpuidle_get_driver();
 
        spin_lock(&cpuidle_driver_lock);
-       if (cpuidle_curr_driver)
-               ret = sprintf(buf, "%s\n", cpuidle_curr_driver->name);
+       if (cpuidle_driver)
+               ret = sprintf(buf, "%s\n", cpuidle_driver->name);
        else
                ret = sprintf(buf, "none\n");
        spin_unlock(&cpuidle_driver_lock);