diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-17 17:53:57 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-18 16:31:59 +0200 |
| commit | c28265764ec6ad9995eb0c761a376ffc9f141fcd (patch) | |
| tree | 3ad899757480d47deb2be6011509a4243e8e0dc2 /drivers/base/core.c | |
| parent | 0ddbcb39c0dc0318f68d858f25a96a074142af2f (diff) | |
| download | kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.zip kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.tar.gz kernel_samsung_smdk4412-c28265764ec6ad9995eb0c761a376ffc9f141fcd.tar.bz2 | |
applied patches from i9305 jb sources, updated mali to r3p0
Change-Id: Iec4bc4e2fb59e2cf5b4d25568a644d4e3719565e
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 835ed32..68bd89e 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1743,10 +1743,12 @@ void device_shutdown(void) */ list_del_init(&dev->kobj.entry); spin_unlock(&devices_kset->list_lock); - /* Disable all device's runtime power management */ - pm_runtime_disable(dev); -#if defined(CONFIG_MACH_Q1_BD) || defined(CONFIG_MACH_PX) + /* Don't allow any more runtime suspends */ + pm_runtime_get_noresume(dev); + pm_runtime_barrier(dev); + +#if defined(CONFIG_MACH_Q1_BD) || defined(CONFIG_MACH_PX) || defined(CONFIG_MACH_MIDAS) /* Temporary log to analyze a problem during shutdown */ if (dev->bus && dev->bus->shutdown) { dev_info(dev, "shutdown +: %pF\n", dev->bus->shutdown); |