From patchwork Fri Oct 17 22:09:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 5099331 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2A0329F30B for ; Fri, 17 Oct 2014 22:10:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5356B20204 for ; Fri, 17 Oct 2014 22:10:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E9B920176 for ; Fri, 17 Oct 2014 22:10:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750867AbaJQWKT (ORCPT ); Fri, 17 Oct 2014 18:10:19 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:55802 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbaJQWJ7 (ORCPT ); Fri, 17 Oct 2014 18:09:59 -0400 Received: from localhost.localdomain (ipb2196950.dynamic.kabel-deutschland.de [178.25.105.80]) by mrelayeu.kundenserver.de (node=mreue104) with ESMTP (Nemesis) id 0M6ETS-1Y3vAm16eQ-00y7ap; Sat, 18 Oct 2014 00:09:54 +0200 From: Stefan Wahren To: rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-pm@vger.kernel.org Subject: [PATCH V2 2/2] cpufreq: cpufreq-dt: Handle regulator_get_voltage() failure Date: Fri, 17 Oct 2014 22:09:49 +0000 Message-Id: <1413583789-24294-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1413583789-24294-1-git-send-email-stefan.wahren@i2se.com> References: <1413583789-24294-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V02:K0:fOfYNuFogJDSSxYgXM+fX2lux4zH0AD+i60tNm+c2yN nddr7r+r6qVFtzvQw6KYNpLKAYjvPPZ4uSPFPY0/WE8iP2IlJS plbvNwVPRPf4Wj+IlwHl32VKfTDuQn+nccC0fY/mlIRwFUjODk Vcd0OxNS5PCNSkwUsKvnIcIoh9vAy+mdvREpq17J7QMCQksL+R Q30ZQ+8AdeYCE7M28u3COJUalYIb1P8rlRLrTdFa9BZ+sNBaf/ fXRuMykO/CNhkACHHyeZVXGAH6tBPsEJALewmTBiKGI9VFb8Hq eijnt97wujY50d8VBiSTH3sRlepkYMvPWYYUH0lUDydw4Z1zDY JVOmFt6VdjgyJSZWoGxJlonXvD3EVmT3BATaeVUSbWje5V1ne5 Gc8xMW8+cIAOXb0Eh5sbW7XJDTWyoLDLs8= X-UI-Out-Filterresults: notjunk:1; Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In error cases regulator_get_voltage() returns a negative value. So take care of it. Signed-off-by: Stefan Wahren --- drivers/cpufreq/cpufreq-dt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index 959d40d..cabaf8c 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -77,7 +77,7 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index) } dev_dbg(cpu_dev, "%u MHz, %ld mV --> %u MHz, %ld mV\n", - old_freq / 1000, volt_old ? volt_old / 1000 : -1, + old_freq / 1000, (volt_old > 0) ? volt_old / 1000 : -1, new_freq / 1000, volt ? volt / 1000 : -1); /* scaling up? scale voltage before frequency */ @@ -93,7 +93,7 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index) ret = clk_set_rate(cpu_clk, freq_exact); if (ret) { dev_err(cpu_dev, "failed to set clock rate: %d\n", ret); - if (!IS_ERR(cpu_reg)) + if (!IS_ERR(cpu_reg) && volt_old > 0) regulator_set_voltage_tol(cpu_reg, volt_old, tol); return ret; }