UPSTREAM: platform: Do not detach from PM domains on shutdown
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Jan 2016 23:12:19 +0000 (00:12 +0100)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 22 Jun 2016 07:16:58 +0000 (15:16 +0800)
Shutdown is carried out when the driver is still bound to the
device, so it is incorrect to detach it from a PM domain (if any)
at this point.

Change-Id: I325d018c98307fc3386273e2ca6f021ead5069b5
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reported-and-tested-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
(cherry picked from commit 2d30bb0b3889adf09b342722b2ce596c0763bc93)

drivers/base/platform.c

index 176b59f5bc4717925e174ce18d794470cf58b91e..9fbafabd82d1ce1af0ccd5c54d62dd6d88745e6c 100644 (file)
@@ -557,7 +557,6 @@ static void platform_drv_shutdown(struct device *_dev)
 
        if (drv->shutdown)
                drv->shutdown(dev);
-       dev_pm_domain_detach(_dev, true);
 }
 
 /**