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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 978B7C04E53 for ; Wed, 15 May 2019 11:33:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56904216F4 for ; Wed, 15 May 2019 11:33:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920008; bh=JJBWEW4rFuZYofcRX2sw185XPT0gitrj1qgq87qq7Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bjg8E6siPu2JKA+RbhPMgHMdtAzBgoNfq0d+1ZRnWpTjJsXeA4gnnR72fzoGEakfm GzqGuWgeKqZ+tbMhP9KePYk1gP6+S52m+Iz1gp9qTH/9QBmD6b/3CivUjCbZUs8C2Q 2ZCrUYtBXPqzrwNaCwiD7lxjd7q7jMTUzdl7XKL4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733195AbfEOLd1 (ORCPT ); Wed, 15 May 2019 07:33:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:45306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731338AbfEOLdX (ORCPT ); Wed, 15 May 2019 07:33:23 -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 E408420843; Wed, 15 May 2019 11:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920002; bh=JJBWEW4rFuZYofcRX2sw185XPT0gitrj1qgq87qq7Sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zq38laBKVk/e3XNef9o9Rc2270q9tnuLboqPKlQgdVWUen82yNfBG45pJnsVCssX1 myCZ1V4ymfG6CSU4icT2JV4mDc/wPx8wWxmjaVBgOSMgxYF0cFOwrpGzXPNfQhhu50 vKQJg8JW05xkRXBCsrDFQ9bxsVCSDozgdyPWdNRQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lei YU , Eddie James , Guenter Roeck Subject: [PATCH 5.1 05/46] hwmon: (occ) Fix extended status bits Date: Wed, 15 May 2019 12:56:29 +0200 Message-Id: <20190515090619.562701155@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090616.670410738@linuxfoundation.org> References: <20190515090616.670410738@linuxfoundation.org> User-Agent: quilt/0.66 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: Lei YU commit b88c5049219a7f322bb1fd65fc30d17472a23563 upstream. The occ's extended status is checked and shown as sysfs attributes. But the code was incorrectly checking the "status" bits. Fix it by checking the "ext_status" bits. Cc: stable@vger.kernel.org Fixes: df04ced684d4 ("hwmon (occ): Add sysfs attributes for additional OCC data") Signed-off-by: Lei YU Reviewed-by: Eddie James Signed-off-by: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/hwmon/occ/sysfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/hwmon/occ/sysfs.c +++ b/drivers/hwmon/occ/sysfs.c @@ -42,16 +42,16 @@ static ssize_t occ_sysfs_show(struct dev val = !!(header->status & OCC_STAT_ACTIVE); break; case 2: - val = !!(header->status & OCC_EXT_STAT_DVFS_OT); + val = !!(header->ext_status & OCC_EXT_STAT_DVFS_OT); break; case 3: - val = !!(header->status & OCC_EXT_STAT_DVFS_POWER); + val = !!(header->ext_status & OCC_EXT_STAT_DVFS_POWER); break; case 4: - val = !!(header->status & OCC_EXT_STAT_MEM_THROTTLE); + val = !!(header->ext_status & OCC_EXT_STAT_MEM_THROTTLE); break; case 5: - val = !!(header->status & OCC_EXT_STAT_QUICK_DROP); + val = !!(header->ext_status & OCC_EXT_STAT_QUICK_DROP); break; case 6: val = header->occ_state;