From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755103Ab2BXHR5 (ORCPT ); Fri, 24 Feb 2012 02:17:57 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:62106 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753066Ab2BXHR4 (ORCPT ); Fri, 24 Feb 2012 02:17:56 -0500 Authentication-Results: mr.google.com; spf=pass (google.com: domain of axel.lin@gmail.com designates 10.68.241.6 as permitted sender) smtp.mail=axel.lin@gmail.com; dkim=pass header.i=axel.lin@gmail.com Message-ID: <1330067866.27530.1.camel@phoenix> Subject: [PATCH] regulator: Set delay to 0 if set_voltage_time_sel callback returns error From: Axel Lin To: linux-kernel@vger.kernel.org Cc: Liam Girdwood , Mark Brown Date: Fri, 24 Feb 2012 15:17:46 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 7bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rdev->desc->ops->set_voltage_time_sel may return negative error code. Set delay to 0 if we got error. Signed-off-by: Axel Lin --- drivers/regulator/core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index beeeb7f..61448b6 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1892,6 +1892,8 @@ static int _regulator_do_set_voltage(struct regulator_dev *rdev, old_selector = ret; delay = rdev->desc->ops->set_voltage_time_sel(rdev, old_selector, selector); + if (delay < 0) + delay = 0; } if (best_val != INT_MAX) { -- 1.7.5.4