Merge tag 'driver-core-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[muen/linux.git] / drivers / base / dd.c

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index e4a5bef93344f99a84811e8a3a3f9c7273319650..2c964f56dafe2a98706ca9cd5520e50bacf551f6 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -475,6 +475,7 @@ pinctrl_bind_failed:
        if (dev->pm_domain && dev->pm_domain->dismiss)
                dev->pm_domain->dismiss(dev);
        pm_runtime_reinit(dev);
        if (dev->pm_domain && dev->pm_domain->dismiss)
                dev->pm_domain->dismiss(dev);
        pm_runtime_reinit(dev);

+       dev_pm_set_driver_flags(dev, 0);

 
        switch (ret) {
        case -EPROBE_DEFER:
 
        switch (ret) {
        case -EPROBE_DEFER:


@@ -877,6 +878,7 @@ static void __device_release_driver(struct device *dev, struct device *parent)
                if (dev->pm_domain && dev->pm_domain->dismiss)
                        dev->pm_domain->dismiss(dev);
                pm_runtime_reinit(dev);
                if (dev->pm_domain && dev->pm_domain->dismiss)
                        dev->pm_domain->dismiss(dev);
                pm_runtime_reinit(dev);

+               dev_pm_set_driver_flags(dev, 0);

 
                klist_remove(&dev->p->knode_driver);
                device_pm_check_callbacks(dev);
 
                klist_remove(&dev->p->knode_driver);
                device_pm_check_callbacks(dev);