diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
| commit | dc65fae3f730b6a1888f5559d68e59111f013c4f (patch) | |
| tree | 019e33c310553116b5b64042820bfb007b0fa832 /drivers/cpuidle | |
| parent | 5ad6d9ba813e2a36b624970f7e5beb4e12641bee (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' into linux-linaro-lsk
This is the 3.10.37 stable release
Diffstat (limited to 'drivers/cpuidle')
| -rw-r--r-- | drivers/cpuidle/driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 8dfaaae94444..2253271b3fac 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -251,7 +251,8 @@ struct cpuidle_driver *cpuidle_driver_ref(void) spin_lock(&cpuidle_driver_lock); drv = cpuidle_get_driver(); - drv->refcnt++; + if (drv) + drv->refcnt++; spin_unlock(&cpuidle_driver_lock); return drv; |