From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbcEMSEF (ORCPT ); Fri, 13 May 2016 14:04:05 -0400 Received: from arroyo.ext.ti.com ([198.47.19.12]:39435 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752361AbcEMSED (ORCPT ); Fri, 13 May 2016 14:04:03 -0400 From: Grygorii Strashko To: "Rafael J. Wysocki" , , Len Brown , Pavel Machek CC: Greg Kroah-Hartman , Kevin Hilman , Ulf Hansson , , Grygorii Strashko Subject: [PATCH] PM / sleep: fix unbalanced pm runtime disable in __device_suspend_late() Date: Fri, 13 May 2016 21:03:48 +0300 Message-ID: <1463162628-16976-1-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.8.2 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The PM runtime will be left disabled for the device if its .suspend_late() callback fails and async suspend is not allowed for this device. In this case device will not be added in dpm_late_early_list and dpm_resume_early() will ignore this device, as result PM runtime will be disabled for it forever (side effect: after 8 subsequent failures for the same device the PM runtime will be reenabled due to disable_depth overflow). Hence, re-enable PM runtime in __device_suspend_late() if .suspend_late() callback fails and async suspend is not allowed for this device. Signed-off-by: Grygorii Strashko --- drivers/base/power/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 6e7c3cc..9b266e5 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1207,10 +1207,13 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as } error = dpm_run_callback(callback, dev, state, info); - if (!error) + if (!error) { dev->power.is_late_suspended = true; - else + } else { async_error = error; + if (!is_async(dev)) + pm_runtime_enable(dev); + } Complete: TRACE_SUSPEND(error); -- 2.8.2