Check status of AcpiReadBitRegister() calls.
Reported by: Coverity CID: 1306132
This commit is contained in:
parent
5672fac935
commit
9ae8e0064a
@ -1074,6 +1074,7 @@ acpi_cpu_idle(sbintime_t sbt)
|
|||||||
struct acpi_cx *cx_next;
|
struct acpi_cx *cx_next;
|
||||||
uint64_t cputicks;
|
uint64_t cputicks;
|
||||||
uint32_t start_time, end_time;
|
uint32_t start_time, end_time;
|
||||||
|
ACPI_STATUS status;
|
||||||
int bm_active, cx_next_idx, i, us;
|
int bm_active, cx_next_idx, i, us;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1119,8 +1120,8 @@ acpi_cpu_idle(sbintime_t sbt)
|
|||||||
*/
|
*/
|
||||||
if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0 &&
|
if ((cpu_quirks & CPU_QUIRK_NO_BM_CTRL) == 0 &&
|
||||||
cx_next_idx > sc->cpu_non_c3) {
|
cx_next_idx > sc->cpu_non_c3) {
|
||||||
AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active);
|
status = AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, &bm_active);
|
||||||
if (bm_active != 0) {
|
if (ACPI_SUCCESS(status) && bm_active != 0) {
|
||||||
AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1);
|
AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1);
|
||||||
cx_next_idx = sc->cpu_non_c3;
|
cx_next_idx = sc->cpu_non_c3;
|
||||||
}
|
}
|
||||||
@ -1285,6 +1286,7 @@ acpi_cpu_quirks_piix4(void)
|
|||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
device_t acpi_dev;
|
device_t acpi_dev;
|
||||||
uint32_t val;
|
uint32_t val;
|
||||||
|
ACPI_STATUS status;
|
||||||
|
|
||||||
acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3);
|
acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3);
|
||||||
if (acpi_dev != NULL) {
|
if (acpi_dev != NULL) {
|
||||||
@ -1323,8 +1325,8 @@ acpi_cpu_quirks_piix4(void)
|
|||||||
val |= PIIX4_STOP_BREAK_MASK;
|
val |= PIIX4_STOP_BREAK_MASK;
|
||||||
pci_write_config(acpi_dev, PIIX4_DEVACTB_REG, val, 4);
|
pci_write_config(acpi_dev, PIIX4_DEVACTB_REG, val, 4);
|
||||||
}
|
}
|
||||||
AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_RLD, &val);
|
status = AcpiReadBitRegister(ACPI_BITREG_BUS_MASTER_RLD, &val);
|
||||||
if (val) {
|
if (ACPI_SUCCESS(status) && val != 0) {
|
||||||
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
|
||||||
"acpi_cpu: PIIX4: reset BRLD_EN_BM\n"));
|
"acpi_cpu: PIIX4: reset BRLD_EN_BM\n"));
|
||||||
AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
|
AcpiWriteBitRegister(ACPI_BITREG_BUS_MASTER_RLD, 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user