Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756589Ab2FZK0a (ORCPT ); Tue, 26 Jun 2012 06:26:30 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:41150 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756297Ab2FZK00 (ORCPT ); Tue, 26 Jun 2012 06:26:26 -0400 From: Mark Brown To: Liam Girdwood Cc: linux-kernel@vger.kernel.org, Axel Lin , Mark Brown Subject: [PATCH 1/2] regulator: core: Only delay if we successfully set the voltage Date: Tue, 26 Jun 2012 11:26:21 +0100 Message-Id: <1340706382-27297-1-git-send-email-broonie@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1116 Lines: 30 There is no need to wait for the voltage to ramp if we didn't manage to set it. Signed-off-by: Mark Brown --- drivers/regulator/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 30ecb49..9f28f2f 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2131,7 +2131,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, best_val = _regulator_get_voltage(rdev); /* Call set_voltage_time_sel if successfully obtained old_selector */ - if (_regulator_is_enabled(rdev) && ret == 0 && old_selector >= 0 && + if (ret == 0 && + _regulator_is_enabled(rdev) && ret == 0 && old_selector >= 0 && rdev->desc->ops->set_voltage_time_sel) { delay = rdev->desc->ops->set_voltage_time_sel(rdev, -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/