diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:03:45 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:03:45 -0400 |
| commit | 587d3d06d5b9d9748d91118ea2edd8be35dd50b5 (patch) | |
| tree | a6f34452e1e4271e4b08283887ed314fe9160f95 | |
| parent | 8a3e582e81d7e8d6a6c2d32374800dc4e9e0cd20 (diff) | |
| download | longterm-queue-5.2-587d3d06d5b9d9748d91118ea2edd8be35dd50b5.tar.gz | |
platform: asus: drop bat1 commit n/a for v5.2.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/platform-x86-asus-wmi-allow-BAT1-battery-name.patch | 28 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/queue/platform-x86-asus-wmi-allow-BAT1-battery-name.patch b/queue/platform-x86-asus-wmi-allow-BAT1-battery-name.patch deleted file mode 100644 index 2ea3620a..00000000 --- a/queue/platform-x86-asus-wmi-allow-BAT1-battery-name.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9a33e375d98ece5ea40c576eabd3257acb90c509 Mon Sep 17 00:00:00 2001 -From: Vasiliy Kupriakov <rublag-ns@yandex.ru> -Date: Tue, 30 Jun 2020 20:56:01 +0300 -Subject: [PATCH] platform/x86: asus-wmi: allow BAT1 battery name - -commit 9a33e375d98ece5ea40c576eabd3257acb90c509 upstream. - -The battery on my laptop ASUS TUF Gaming FX706II is named BAT1. -This patch allows battery extension to load. - -Signed-off-by: Vasiliy Kupriakov <rublag-ns@yandex.ru> -Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> - -diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 877aade19497..8f4acdc06b13 100644 ---- a/drivers/platform/x86/asus-wmi.c -+++ b/drivers/platform/x86/asus-wmi.c -@@ -441,6 +441,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; - --- -2.27.0 - diff --git a/queue/series b/queue/series index 2e6d6510..8a2b5d46 100644 --- a/queue/series +++ b/queue/series @@ -70,7 +70,6 @@ usb-dwc3-pci-add-support-for-the-Intel-Jasper-Lake.patch usb-gadget-udc-gr_udc-fix-memleak-on-error-handling-.patch hwmon-adm1275-Make-sure-we-are-reading-enough-data-f.patch hwmon-nct6775-Accept-PECI-Calibration-as-temperature.patch -platform-x86-asus-wmi-allow-BAT1-battery-name.patch hwmon-scmi-Fix-potential-buffer-overflow-in-scmi_hwm.patch ALSA-hda-realtek-fixup-for-yet-another-Intel-referen.patch drivers-perf-Fix-kernel-panic-when-rmmod-PMU-modules.patch |