Skip to content

L
linux-davinci
Commit 4e54e9f4 authored by Len Brown's avatar Len Brown
Browse files
Options

Pull sbs into release branch

parents 27196c30 bc90a010
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 5 deletions
drivers/acpi/sbs.c
View file @ 4e54e9f4
...@@ -1415,7 +1415,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type) ...@@ -1415,7 +1415,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
char dir_name[32]; char dir_name[32];
int do_battery_init = 0, do_ac_init = 0; int do_battery_init = 0, do_ac_init = 0;
int old_remaining_capacity = 0; int old_remaining_capacity = 0;
int update_ac = 1, update_battery = 1; int update_battery = 1;
int up_tm = update_time; int up_tm = update_time;
if (sbs_zombie(sbs)) { if (sbs_zombie(sbs)) {
...@@ -1435,10 +1435,6 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type) ...@@ -1435,10 +1435,6 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
sbs->run_cnt++; sbs->run_cnt++;
if (!update_ac && !update_battery) {
goto end;
}
old_ac_present = sbs->ac.ac_present; old_ac_present = sbs->ac.ac_present;
result = acpi_ac_get_present(sbs); result = acpi_ac_get_present(sbs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment