platform/x86: asus-wmi: Support laptops where the first battery is named BATT

[sfrench/cifs-2.6.git] / drivers / platform / x86 / asus-wmi.c

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 612ef552622680125706edf9a3381f439d20fd93..01becbe2a9a85d0877454b93a8605c2f35c65e7c 100644 (file)
--- 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 power_supply *battery)
 {
        /* 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,