From mboxrd@z Thu Jan 1 00:00:00 1970 From: Derek Basehore Subject: [PATCH v2 1/3] PM / sleep: Check legacy pm callbacks for direct complete Date: Wed, 24 Feb 2016 16:22:26 -0800 Message-ID: <1456359748-22838-1-git-send-email-dbasehore@chromium.org> Return-path: Received: from mail-pa0-f44.google.com ([209.85.220.44]:34524 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757530AbcBYAWc (ORCPT ); Wed, 24 Feb 2016 19:22:32 -0500 Received: by mail-pa0-f44.google.com with SMTP id fy10so21525134pac.1 for ; Wed, 24 Feb 2016 16:22:31 -0800 (PST) Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, "Martin K . Petersen" , linux-scsi@vger.kernel.org, Derek Basehore This adds checks for legacy pm callbacks when setting no_pm_callbacks. This fixes an issue where these suspend/resume callbacks were incorrectly ignored during suspend/resume with direct complete. Fixes: aa8e54b55947 "PM / sleep: Go direct_complete if driver has..." Signed-off-by: Derek Basehore --- drivers/base/power/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6e7c3cc..e0017d9 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1764,8 +1764,10 @@ 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 || (!dev->bus->resume && !dev->bus->suspend && + pm_ops_is_empty(dev->bus->pm))) && + (!dev->class || (!dev->class->resume && !dev->class->suspend && + pm_ops_is_empty(dev->class->pm))) && (!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)); -- 2.7.0.rc3.207.g0ac5344