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.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=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 78921ECE58E for ; Thu, 10 Oct 2019 09:02:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4805D2067B for ; Thu, 10 Oct 2019 09:02:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570698159; bh=JhpwYVPZWzsFNd6QwvFFKndx2tJx7saqs/LmQtanksU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h6jQDdH8yUqLy/kTrgvOkypqvMivaWots2p234X75XL4YH6yCYpZo+p5sug1CanXz eivwTGvykCTkt0DCDRU0M/Qt5Z9chyz807Hitfoaep/zMf7SglcjTieZ/6WUaeZsa/ w1vVkg3D/qaByuA3gdFR4/hf1W+4MMnGgxWEoemY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387898AbfJJIje (ORCPT ); Thu, 10 Oct 2019 04:39:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:43176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387430AbfJJIjd (ORCPT ); Thu, 10 Oct 2019 04:39:33 -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 7879A21920; Thu, 10 Oct 2019 08:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570696773; bh=JhpwYVPZWzsFNd6QwvFFKndx2tJx7saqs/LmQtanksU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ebjzhMygCSZigrkrGQZvXwgFZGT1pVvFsuOUJyJse/gaMLzaYx2eeV3fYYN5gc27C OjPRnHiaN0yx2uKVXNrVWztsrrptIpV+mI64oWKDcqwPQVe5YW9tC/RsDF9tBhDhac 9wMKBX9qglc7kBmOXfJAQj8brCzsAgLxh57EQJyw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Nosthoff , Brian Norris , Enric Balletbo i Serra , Sebastian Reichel Subject: [PATCH 5.3 048/148] power: supply: sbs-battery: use correct flags field Date: Thu, 10 Oct 2019 10:35:09 +0200 Message-Id: <20191010083614.052172553@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083609.660878383@linuxfoundation.org> References: <20191010083609.660878383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Nosthoff commit 99956a9e08251a1234434b492875b1eaff502a12 upstream. the type flag is stored in the chip->flags field not in the client->flags field. This currently leads to never using the ti specific health function as client->flags doesn't use that bit. So it's always falling back to the general one. Fixes: 76b16f4cdfb8 ("power: supply: sbs-battery: don't assume MANUFACTURER_DATA formats") Cc: Signed-off-by: Michael Nosthoff Reviewed-by: Brian Norris Reviewed-by: Enric Balletbo i Serra Signed-off-by: Sebastian Reichel Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/sbs-battery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -620,7 +620,7 @@ static int sbs_get_property(struct power switch (psp) { case POWER_SUPPLY_PROP_PRESENT: case POWER_SUPPLY_PROP_HEALTH: - if (client->flags & SBS_FLAGS_TI_BQ20Z75) + if (chip->flags & SBS_FLAGS_TI_BQ20Z75) ret = sbs_get_ti_battery_presence_and_health(client, psp, val); else