Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-08-12 00:21:22 -0400
committerLen Brown <len.brown@intel.com>2007-08-12 00:21:22 -0400
commit4e54e9f4423a86aa21b70cb9d339cb09f275188f (patch)
tree3c4c252465e3ac2bdedfaaa4ff3b73e73e304f3c
parent27196c30db1ed4ab09c2071149b3324a1a53cfb9 (diff)
parentbc90a0105dea7b773e99ae7abde56a6930081ddb (diff)
Pull sbs into release branch
-rw-r--r--drivers/acpi/sbs.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index 7d8e78ea13a5..82c3a550016d 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -1415,7 +1415,7 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type)
char dir_name[32];
int do_battery_init = 0, do_ac_init = 0;
int old_remaining_capacity = 0;
- int update_ac = 1, update_battery = 1;
+ int update_battery = 1;
int up_tm = update_time;
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++;
- if (!update_ac && !update_battery) {
- goto end;
- }
-
old_ac_present = sbs->ac.ac_present;
result = acpi_ac_get_present(sbs);