Pull sbs into release branch

Len Brown 4e54e9f4 27196c30

+1 -5
+1 -5
drivers/acpi/sbs.c
··· 1415 char dir_name[32]; 1416 int do_battery_init = 0, do_ac_init = 0; 1417 int old_remaining_capacity = 0; 1418 - int update_ac = 1, update_battery = 1; 1419 int up_tm = update_time; 1420 1421 if (sbs_zombie(sbs)) { ··· 1434 } 1435 1436 sbs->run_cnt++; 1437 - 1438 - if (!update_ac && !update_battery) { 1439 - goto end; 1440 - } 1441 1442 old_ac_present = sbs->ac.ac_present; 1443
··· 1415 char dir_name[32]; 1416 int do_battery_init = 0, do_ac_init = 0; 1417 int old_remaining_capacity = 0; 1418 + int update_battery = 1; 1419 int up_tm = update_time; 1420 1421 if (sbs_zombie(sbs)) { ··· 1434 } 1435 1436 sbs->run_cnt++; 1437 1438 old_ac_present = sbs->ac.ac_present; 1439