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=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 B9A49C352BE for ; Thu, 16 Apr 2020 14:53:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F1F6206D9 for ; Thu, 16 Apr 2020 14:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587048818; bh=w2Ej3Tf7bYLxv0YY/vSBA1bE+ot8s4ZOc9fI9Z+53YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=19cRNfEqhMQfxknZogIrtBMX/855Jbpvy+IM4e8m/d0vIEN7LQkWOsJt/5Rh0c5eO GKhfsqtd2xcMQ8IvAwjoWVUPWENGWdzvhCzwN4isj5Q8Xn5xyjhR10WCbb1eiqK24k yogQdIASpAWMZJ4PNbp/eBoa7hTGh9/jh0GPcIQc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403755AbgDPOxg (ORCPT ); Thu, 16 Apr 2020 10:53:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:44188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409251AbgDPN5H (ORCPT ); Thu, 16 Apr 2020 09:57:07 -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 1C86421734; Thu, 16 Apr 2020 13:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587045427; bh=w2Ej3Tf7bYLxv0YY/vSBA1bE+ot8s4ZOc9fI9Z+53YQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RBM275C89iZjh1sFdI0UXMLeFsqNJ0qX3eQN58BA0ygFiNwoQO3DRQ71PV3AWpLQ6 OoMwH5jhhPvbDaRlWvvZhFrvbRxSpT297O1nVVR4oBaqezmj1mUD+VHp7cdTdhc9E6 YSamk9K4dYiNUYfeuBhRlku6GYRRA9WuznlH4KQ4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kristian Klausen , Andy Shevchenko Subject: [PATCH 5.6 129/254] platform/x86: asus-wmi: Support laptops where the first battery is named BATT Date: Thu, 16 Apr 2020 15:23:38 +0200 Message-Id: <20200416131342.593864784@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.804095985@linuxfoundation.org> References: <20200416131325.804095985@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: Kristian Klausen commit 6b3586d45bba14f6912f37488090c37a3710e7b4 upstream. The WMI method to set the charge threshold does not provide a way to specific a battery, so we assume it is the first/primary battery (by checking if the name is BAT0). On some newer ASUS laptops (Zenbook UM431DA) though, the primary/first battery isn't named BAT0 but BATT, so we need to support that case. Fixes: 7973353e92ee ("platform/x86: asus-wmi: Refactor charge threshold to use the battery hooking API") Cc: stable@vger.kernel.org Signed-off-by: Kristian Klausen Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/asus-wmi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -426,8 +426,11 @@ static int asus_wmi_battery_add(struct p { /* The WMI method does not provide a way to specific a battery, so we * just assume it is the first battery. + * Note: On some newer ASUS laptops (Zenbook UM431DA), the primary/first + * battery is named BATT. */ - if (strcmp(battery->desc->name, "BAT0") != 0) + if (strcmp(battery->desc->name, "BAT0") != 0 && + strcmp(battery->desc->name, "BATT") != 0) return -ENODEV; if (device_create_file(&battery->dev,