From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755016AbbCBUlT (ORCPT ); Mon, 2 Mar 2015 15:41:19 -0500 Received: from bhuna.collabora.co.uk ([93.93.135.160]:33688 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754502AbbCBUlS (ORCPT ); Mon, 2 Mar 2015 15:41:18 -0500 From: Javier Martinez Canillas To: Mark Brown Cc: Liam Girdwood , Doug Anderson , linux-kernel@vger.kernel.org, Javier Martinez Canillas Subject: [PATCH 1/1] regulator: Only enable disabled regulators on resume Date: Mon, 2 Mar 2015 21:40:39 +0100 Message-Id: <1425328839-28330-1-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 2.1.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After leaving from system wide suspend state, regulator_suspend_finish() turn on regulators that may be turned off by regulator_suspend_prepare() but it tries to enable all regulators that have an enable count > 0 or that were marked as "always-on" regardless if those were disabled or not. Trying to enable an already enabled regulator may cause issues so is better to skip enabling regulators that were not disabled before suspend. Signed-off-by: Javier Martinez Canillas --- drivers/regulator/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f2452148c8da..8551400d57e4 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -3816,9 +3816,11 @@ int regulator_suspend_finish(void) list_for_each_entry(rdev, ®ulator_list, list) { mutex_lock(&rdev->mutex); if (rdev->use_count > 0 || rdev->constraints->always_on) { - error = _regulator_do_enable(rdev); - if (error) - ret = error; + if (!_regulator_is_enabled(rdev)) { + error = _regulator_do_enable(rdev); + if (error) + ret = error; + } } else { if (!have_full_constraints()) goto unlock; -- 2.1.3