lkml.org 
[lkml]   [2015]   [May]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 48/72] ACPI / SBS: Enable battery manager when present
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chris Bainbridge <chris.bainbridge@gmail.com>

    commit 61f8ff693923e4b19748b0e8287b99778f2661c7 upstream.

    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>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/sbs.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/acpi/sbs.c
    +++ b/drivers/acpi/sbs.c
    @@ -670,7 +670,7 @@ static int acpi_sbs_add(struct acpi_devi
    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);



    \
     
     \ /
      Last update: 2015-05-11 21:21    [W:4.037 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site