lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull sbs into release branch

Browse Source
This commit is contained in:
Len Brown
2007-08-12 00:21:22 -04:00
parent 27196c30db bc90a0105d
commit 4e54e9f442
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/sbs.c
View File

@@ -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)
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);