Deleted Added
full compact
28c28
< __FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_powerres.c 248415 2013-03-17 07:28:17Z rpaulo $");
---
> __FBSDID("$FreeBSD: head/sys/dev/acpica/acpi_powerres.c 267647 2014-06-19 18:35:14Z jhb $");
67d66
< #define ACPI_PWR_UNK (-1)
93d91
< int ap_state;
176d173
< rp->ap_state = ACPI_PWR_UNK;
641d637
< /* We could cache this if we trusted it not to change under us */
648,649c644
< } else if (rp->ap_state == ACPI_PWR_UNK)
< rp->ap_state = cur;
---
> }
656c651
< if (rp->ap_state != ACPI_PWR_ON) {
---
> if (cur != ACPI_PWR_ON) {
664d658
< rp->ap_state = ACPI_PWR_ON;
685d678
< /* We could cache this if we trusted it not to change under us */
692,693c685
< } else if (rp->ap_state == ACPI_PWR_UNK)
< rp->ap_state = cur;
---
> }
700c692
< if (rp->ap_state != ACPI_PWR_OFF) {
---
> if (cur != ACPI_PWR_OFF) {
708d699
< rp->ap_state = ACPI_PWR_OFF;