aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/core.c
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-02 13:09:29 +0200
committercodeworkx <daniel.hillenbrand@codeworkx.de>2012-06-02 13:09:29 +0200
commitc6da2cfeb05178a11c6d062a06f8078150ee492f (patch)
treef3b4021d252c52d6463a9b3c1bb7245e399b009c /drivers/base/core.c
parentc6d7c4dbff353eac7919342ae6b3299a378160a6 (diff)
downloadkernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.zip
kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.gz
kernel_samsung_smdk4412-c6da2cfeb05178a11c6d062a06f8078150ee492f.tar.bz2
samsung update 1
Diffstat (limited to 'drivers/base/core.c')
-rw-r--r--drivers/base/core.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 78445f4..835ed32 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1746,6 +1746,19 @@ void device_shutdown(void)
/* Disable all device's runtime power management */
pm_runtime_disable(dev);
+#if defined(CONFIG_MACH_Q1_BD) || defined(CONFIG_MACH_PX)
+ /* Temporary log to analyze a problem during shutdown */
+ if (dev->bus && dev->bus->shutdown) {
+ dev_info(dev, "shutdown +: %pF\n", dev->bus->shutdown);
+ dev->bus->shutdown(dev);
+ dev_info(dev, "shutdown -\n");
+ } else if (dev->driver && dev->driver->shutdown) {
+ dev_info(dev, "shutdown +: %pF\n",
+ dev->driver->shutdown);
+ dev->driver->shutdown(dev);
+ dev_info(dev, "shutdown -\n");
+ }
+#else
if (dev->bus && dev->bus->shutdown) {
dev_dbg(dev, "shutdown\n");
dev->bus->shutdown(dev);
@@ -1753,6 +1766,7 @@ void device_shutdown(void)
dev_dbg(dev, "shutdown\n");
dev->driver->shutdown(dev);
}
+#endif
put_device(dev);
spin_lock(&devices_kset->list_lock);