i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Free ci on error

Browse Source
This commit is contained in:
Fredrik Holmqvist
2018-04-21 23:37:01 +02:00
parent 29208af825
commit c7fad27a8b
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/power/x86_cpuidle/acpi_cpuidle.cpp
+13 -10
View File
@@ -272,24 +272,24 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
if (object->object_type != ACPI_TYPE_PACKAGE) { if (object->object_type != ACPI_TYPE_PACKAGE) {
dprintf("invalid _CST object\n"); dprintf("invalid _CST object\n");
return B_ERROR; goto error;
} }
if (object->data.package.count != 4) { if (object->data.package.count != 4) {
dprintf("invalid _CST number\n"); dprintf("invalid _CST number\n");
return B_ERROR; goto error;
} }
// type // type
acpi_object_type * pointer = &object->data.package.objects[1]; acpi_object_type * pointer = &object->data.package.objects[1];
if (pointer->object_type != ACPI_TYPE_INTEGER) { if (pointer->object_type != ACPI_TYPE_INTEGER) {
dprintf("invalid _CST elem type\n"); dprintf("invalid _CST elem type\n");
return B_ERROR; goto error;
} }
uint32 n = pointer->data.integer; uint32 n = pointer->data.integer;
if (n < 1 || n > 3) { if (n < 1 || n > 3) {
dprintf("invalid _CST elem value\n"); dprintf("invalid _CST elem value\n");
return B_ERROR; goto error;
} }
ci->type = n; ci->type = n;
dprintf("C%" B_PRId32 "\n", n); dprintf("C%" B_PRId32 "\n", n);
@@ -299,7 +299,7 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
pointer = &object->data.package.objects[2]; pointer = &object->data.package.objects[2];
if (pointer->object_type != ACPI_TYPE_INTEGER) { if (pointer->object_type != ACPI_TYPE_INTEGER) {
dprintf("invalid _CST elem type\n"); dprintf("invalid _CST elem type\n");
return B_ERROR; goto error;
} }
n = pointer->data.integer; n = pointer->data.integer;
cState->latency = n; cState->latency = n;
@@ -309,7 +309,7 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
pointer = &object->data.package.objects[3]; pointer = &object->data.package.objects[3];
if (pointer->object_type != ACPI_TYPE_INTEGER) { if (pointer->object_type != ACPI_TYPE_INTEGER) {
dprintf("invalid _CST elem type\n"); dprintf("invalid _CST elem type\n");
return B_ERROR; goto error;
} }
n = pointer->data.integer; n = pointer->data.integer;
dprintf("power: %" B_PRId32 "\n", n); dprintf("power: %" B_PRId32 "\n", n);
@@ -318,11 +318,11 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
pointer = &object->data.package.objects[0]; pointer = &object->data.package.objects[0];
if (pointer->object_type != ACPI_TYPE_BUFFER) { if (pointer->object_type != ACPI_TYPE_BUFFER) {
dprintf("invalid _CST elem type\n"); dprintf("invalid _CST elem type\n");
return B_ERROR; goto error;
} }
if (pointer->data.buffer.length < 15) { if (pointer->data.buffer.length < 15) {
dprintf("invalid _CST elem length\n"); dprintf("invalid _CST elem length\n");
return B_ERROR; goto error;
} }
struct acpicpu_reg *reg = (struct acpicpu_reg *)pointer->data.buffer.buffer; struct acpicpu_reg *reg = (struct acpicpu_reg *)pointer->data.buffer.buffer;
@@ -331,11 +331,11 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
dprintf("IO method\n"); dprintf("IO method\n");
if (reg->reg_addr == 0) { if (reg->reg_addr == 0) {
dprintf("illegal address\n"); dprintf("illegal address\n");
return B_ERROR; goto error;
} }
if (reg->reg_bitwidth != 8) { if (reg->reg_bitwidth != 8) {
dprintf("invalid source length\n"); dprintf("invalid source length\n");
return B_ERROR; goto error;
} }
ci->address = reg->reg_addr; ci->address = reg->reg_addr;
ci->method = ACPI_CSTATE_SYSIO; ci->method = ACPI_CSTATE_SYSIO;
@@ -361,6 +361,9 @@ acpi_cstate_add(acpi_object_type *object, CpuidleCstate *cState)
cState->EnterIdle = acpi_cstate_idle; cState->EnterIdle = acpi_cstate_idle;
return B_OK; return B_OK;
error:
free(ci);
return B_ERROR;
} }