diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:46 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-08-10 07:07:49 +0300 |
| commit | 4789fd48a313d36fe6b8fc1da5e0788f5ea074cb (patch) | |
| tree | 2c8c27b52f0e38abb7416ce81b04c3b85511b694 /drivers/platform/x86/asus-wmi.c | |
| parent | 8a9b346382056b52cd7ff141ae9f15a0fcfeb13d (diff) | |
| parent | d9939285fc818425ae92bd99f8c97b6b9ef3bb88 (diff) | |
| download | linux-dev-5.4.tar.xz | |
Merge tag 'v5.4.57' into dev-5.4dev-5.4
This is the 5.4.57 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/platform/x86/asus-wmi.c')
| -rw-r--r-- | drivers/platform/x86/asus-wmi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index b1f4a31ba1ee..ed83fb135bab 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -424,6 +424,7 @@ static int asus_wmi_battery_add(struct power_supply *battery) * battery is named BATT. */ if (strcmp(battery->desc->name, "BAT0") != 0 && + strcmp(battery->desc->name, "BAT1") != 0 && strcmp(battery->desc->name, "BATT") != 0) return -ENODEV; |