aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Bainbridge <chris.bainbridge@gmail.com>2015-04-22 16:40:21 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-29 00:04:29 +0200
commit61f8ff693923e4b19748b0e8287b99778f2661c7 (patch)
treecef0ee9f6afae2261a32cc93dfbbd552da5106ae
parentb787f68c36d49bb1d9236f403813641efa74a031 (diff)
downloadlinux-stericsson-61f8ff693923e4b19748b0e8287b99778f2661c7.tar.gz
ACPI / SBS: Enable battery manager when present
Commit 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on Apple) introduced a regression disabling the SBS battery manager. The battery manager should be marked as present when acpi_manager_get_info() returns 0. Fixes: 9faf6136ff46 (ACPI / SBS: Disable smart battery manager on Apple) Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com> Cc: 3.18+ <stable@vger.kernel.org> # 3.18+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/sbs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index cd827625cf07..01504c819e8f 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -684,7 +684,7 @@ static int acpi_sbs_add(struct acpi_device *device)
if (!sbs_manager_broken) {
result = acpi_manager_get_info(sbs);
if (!result) {
- sbs->manager_present = 0;
+ sbs->manager_present = 1;
for (id = 0; id < MAX_SBS_BAT; ++id)
if ((sbs->batteries_supported & (1 << id)))
acpi_battery_add(sbs, id);