From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 5E404C433FF for ; Mon, 29 Jul 2019 12:03:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 371482070D for ; Mon, 29 Jul 2019 12:03:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387816AbfG2MD3 (ORCPT ); Mon, 29 Jul 2019 08:03:29 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57427 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387398AbfG2MD2 (ORCPT ); Mon, 29 Jul 2019 08:03:28 -0400 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1hs4NA-0004K2-3O; Mon, 29 Jul 2019 12:03:24 +0000 From: Colin King To: Zhang Rui , Eduardo Valentin , Daniel Lezcano , Srinivas Pandruvada , linux-pm@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][V2] drivers: thermal: processor_thermal_device: fix missing bitwise-or operators Date: Mon, 29 Jul 2019 13:03:23 +0100 Message-Id: <20190729120323.15838-1-colin.king@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King The variable val is having the top 8 bits cleared and then the variable is being re-assinged and setting just the top 8 bits. I believe the intention was bitwise-or in the top 8 bits. Fix this by replacing the = operators with &= and |= instead. Addresses-Coverity: ("Unused value") Fixes: b0c74b08517e ("drivers: thermal: processor_thermal_device: Export sysfs inteface for TCC offset") Signed-off-by: Colin Ian King --- V2: Add in &= operator missing from V1. Doh. --- .../thermal/intel/int340x_thermal/processor_thermal_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c index 6f6ac6a8e82d..97333fc4be42 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c @@ -163,8 +163,8 @@ static int tcc_offset_update(int tcc) if (err) return err; - val = ~GENMASK_ULL(31, 24); - val = (tcc & 0xff) << 24; + val &= ~GENMASK_ULL(31, 24); + val |= (tcc & 0xff) << 24; err = wrmsrl_safe(MSR_IA32_TEMPERATURE_TARGET, val); if (err) -- 2.20.1