From patchwork Sat Oct 4 20:26:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 5033001 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8B977C11AB for ; Sat, 4 Oct 2014 20:26:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 534CF20103 for ; Sat, 4 Oct 2014 20:26:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6DACA200E3 for ; Sat, 4 Oct 2014 20:26:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751033AbaJDU0W (ORCPT ); Sat, 4 Oct 2014 16:26:22 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:59547 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750998AbaJDU0W (ORCPT ); Sat, 4 Oct 2014 16:26:22 -0400 Received: from localhost.localdomain (ipb2196950.dynamic.kabel-deutschland.de [178.25.105.80]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MSr7l-1XkeE51fW9-00Rnox; Sat, 04 Oct 2014 22:26:20 +0200 From: Stefan Wahren To: rjw@rjwysocki.net, viresh.kumar@linaro.org Cc: linux-pm@vger.kernel.org, shawn.guo@freescale.com, Stefan Wahren Subject: [PATCH 2/2] cpufreq: cpu0: Handle regulator_get_voltage() failure Date: Sat, 4 Oct 2014 20:26:04 +0000 Message-Id: <1412454365-17804-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1412454365-17804-1-git-send-email-stefan.wahren@i2se.com> References: <1412454365-17804-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V02:K0:ZHV5iHb/Kd2pbRTf+XnrGObyvdOjT6IxChrvZ+82MJD y/rdgqzk0+oyntOqcqp5U3mHkZs5v1h2Hy2NcntyLb5oGk/Kvk Qh3bafYZcApjrjCdaZ47EhYN8JVXyDZBp2wkKMCKbQPRZYlC3W HJHjQJIYZnpwLSHimD3mTRm5bj5rzCSrVrCzYRVZHd1J6lPyVk mkHhCKgYGYnoF6Y36FSy2U4cSUGYtFSGOmiQW21HTMC97j8BXB YHU+m491Xlb9mFoLNZsxylK4XG6z0qqBhIZ/IXgIPLUVdO7aXS PbHDmaZY1/40w4SQyznO/H5Dq3m9/hc+a4KX2GtwKbRzJIgowP rWoITaTtGHAaOoDHeZF9l+1S3xOsfhLqlcJ8pZb3UaCJCQVKMc sbWvSPg+7IXu5fBrILvK89hCAjlX3WGrzo= 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, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Acked-by: Viresh Kumar --- drivers/cpufreq/cpufreq-cpu0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c index ef3d618..6aa2104 100644 --- a/drivers/cpufreq/cpufreq-cpu0.c +++ b/drivers/cpufreq/cpufreq-cpu0.c @@ -77,7 +77,7 @@ static int cpu0_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 cpu0_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; }