diff options
author | Len Brown <len.brown@intel.com> | 2007-08-12 00:21:22 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-08-12 00:21:22 -0400 |
commit | 4e54e9f4423a86aa21b70cb9d339cb09f275188f (patch) | |
tree | 3c4c252465e3ac2bdedfaaa4ff3b73e73e304f3c /drivers/acpi | |
parent | 27196c30db1ed4ab09c2071149b3324a1a53cfb9 (diff) | |
parent | bc90a0105dea7b773e99ae7abde56a6930081ddb (diff) |
Pull sbs into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/sbs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 7d8e78ea13a..82c3a550016 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) | |||
1415 | char dir_name[32]; | 1415 | char dir_name[32]; |
1416 | int do_battery_init = 0, do_ac_init = 0; | 1416 | int do_battery_init = 0, do_ac_init = 0; |
1417 | int old_remaining_capacity = 0; | 1417 | int old_remaining_capacity = 0; |
1418 | int update_ac = 1, update_battery = 1; | 1418 | int update_battery = 1; |
1419 | int up_tm = update_time; | 1419 | int up_tm = update_time; |
1420 | 1420 | ||
1421 | if (sbs_zombie(sbs)) { | 1421 | if (sbs_zombie(sbs)) { |
@@ -1435,10 +1435,6 @@ static int acpi_sbs_update_run(struct acpi_sbs *sbs, int id, int data_type) | |||
1435 | 1435 | ||
1436 | sbs->run_cnt++; | 1436 | sbs->run_cnt++; |
1437 | 1437 | ||
1438 | if (!update_ac && !update_battery) { | ||
1439 | goto end; | ||
1440 | } | ||
1441 | |||
1442 | old_ac_present = sbs->ac.ac_present; | 1438 | old_ac_present = sbs->ac.ac_present; |
1443 | 1439 | ||
1444 | result = acpi_ac_get_present(sbs); | 1440 | result = acpi_ac_get_present(sbs); |