Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a02f8cb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman
Browse files

PM: core: Fix device_pm_check_callbacks() 



commit 157c460e10cb6eca29ccbd0f023db159d0c55ec7 upstream.

The device_pm_check_callbacks() function doesn't check legacy
->suspend and ->resume callback pointers under the device's
bus type, class and driver, so in some cases it may set the
no_pm_callbacks flag for the device incorrectly and then the
callbacks may be skipped during system suspend/resume, which
shouldn't happen.

Fixes: aa8e54b5 (PM / sleep: Go direct_complete if driver has no callbacks)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22338c55

drivers/base/power/main.c

+6 −3
Original line number Diff line number Diff line
@@ -1757,10 +1757,13 @@ void device_pm_check_callbacks(struct device *dev) 
{

	spin_lock_irq(&dev->power.lock);

	dev->power.no_pm_callbacks =

		(!dev->bus || pm_ops_is_empty(dev->bus->pm)) &&

		(!dev->class || pm_ops_is_empty(dev->class->pm)) &&

		(!dev->bus || (pm_ops_is_empty(dev->bus->pm) &&

		 !dev->bus->suspend && !dev->bus->resume)) &&

		(!dev->class || (pm_ops_is_empty(dev->class->pm) &&

		 !dev->class->suspend && !dev->class->resume)) &&

		(!dev->type || pm_ops_is_empty(dev->type->pm)) &&

		(!dev->pm_domain || pm_ops_is_empty(&dev->pm_domain->ops)) &&

		(!dev->driver || pm_ops_is_empty(dev->driver->pm));

		(!dev->driver || (pm_ops_is_empty(dev->driver->pm) &&

		 !dev->driver->suspend && !dev->driver->resume));

	spin_unlock_irq(&dev->power.lock);

}