From patchwork Wed Apr 22 09:56:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 227322 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36AF1C55186 for ; Wed, 22 Apr 2020 10:06:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0C0832076C for ; Wed, 22 Apr 2020 10:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550008; bh=aduk6n1i/K9ugGri0wivd5UdqpnQ1CSzRXLqmPF38Hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Pz+0i8hThT9vSlngztDj/vffS4ljwy3KpiLMI/JMy6sbODVGPuEfO3mnJ2AHrm0AW WchuieYe10Zds59rI7SFkTUhn12wvZm7oMHBAJmbCmx9DCiAGgrx+6/POYBkm9Tjtl gMNcricW3cHpw9BaPWPzgkLH4lt8Xk2d9RCpn39M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgDVKGq (ORCPT ); Wed, 22 Apr 2020 06:06:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:58822 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728390AbgDVKGo (ORCPT ); Wed, 22 Apr 2020 06:06:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3FC9520575; Wed, 22 Apr 2020 10:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587550003; bh=aduk6n1i/K9ugGri0wivd5UdqpnQ1CSzRXLqmPF38Hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GAkK5ZXe/hgR3wRZHmg9JiDdAXXY1+iBTmKnvxnkvC6lZzaELnn7lu6K8J1z/1kfK Sqxzu1rmMdG/UujNhFs8aQQQMB3NswrFKI7+JEkJw1LkA6zG3LLeJNV23kObDiWYuW bEKtpPAKYnuwIUrWst9Dw2HvcYnwSfNGvfcYjmkI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Dedy Lansky , Maya Erez , Kalle Valo , Lee Jones Subject: [PATCH 4.9 093/125] wil6210: fix temperature debugfs Date: Wed, 22 Apr 2020 11:56:50 +0200 Message-Id: <20200422095048.265685753@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200422095032.909124119@linuxfoundation.org> References: <20200422095032.909124119@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dedy Lansky [ Upstream commit 6d9eb7ebae3d7e951bc0999235ae7028eb4cae4f ] For negative temperatures, "temp" debugfs is showing wrong values. Use signed types so proper calculations is done for sub zero temperatures. Signed-off-by: Dedy Lansky Signed-off-by: Maya Erez Signed-off-by: Kalle Valo Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/ath/wil6210/debugfs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c @@ -1091,7 +1091,7 @@ static const struct file_operations fops }; /*---------temp------------*/ -static void print_temp(struct seq_file *s, const char *prefix, u32 t) +static void print_temp(struct seq_file *s, const char *prefix, s32 t) { switch (t) { case 0: @@ -1099,7 +1099,8 @@ static void print_temp(struct seq_file * seq_printf(s, "%s N/A\n", prefix); break; default: - seq_printf(s, "%s %d.%03d\n", prefix, t / 1000, t % 1000); + seq_printf(s, "%s %s%d.%03d\n", prefix, (t < 0 ? "-" : ""), + abs(t / 1000), abs(t % 1000)); break; } } @@ -1107,7 +1108,7 @@ static void print_temp(struct seq_file * static int wil_temp_debugfs_show(struct seq_file *s, void *data) { struct wil6210_priv *wil = s->private; - u32 t_m, t_r; + s32 t_m, t_r; int rc = wmi_get_temperature(wil, &t_m, &t_r); if (rc) {