shark/bbswitch-g14
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bbswitch: always pass a Buffer object for empty args

Browse Source
This commit is contained in:
Lekensteyn 2011-12-17 19:14:47 +01:00
parent 46b9032921
commit 96ff2ed501
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bbswitch.c
View File

@ -68,7 +68,7 @@ static char *buffer_to_string(const char buffer[], char *target) {
// succeeded, the result is stored in "result" providing that the result is an // succeeded, the result is stored in "result" providing that the result is an
// integer or a buffer containing 4 values // integer or a buffer containing 4 values
static int acpi_call_dsm(acpi_handle handle, const char muid[16], int revid, static int acpi_call_dsm(acpi_handle handle, const char muid[16], int revid,
int func, char *args, uint32_t *result) { int func, char args[4], uint32_t *result) {
struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_object_list input; struct acpi_object_list input;
union acpi_object params[4]; union acpi_object params[4];
@ -84,14 +84,14 @@ static int acpi_call_dsm(acpi_handle handle, const char muid[16], int revid,
params[1].integer.value = revid; params[1].integer.value = revid;
params[2].type = ACPI_TYPE_INTEGER; params[2].type = ACPI_TYPE_INTEGER;
params[2].integer.value = func; params[2].integer.value = func;
if (args) {
params[3].type = ACPI_TYPE_BUFFER; params[3].type = ACPI_TYPE_BUFFER;
params[3].buffer.length = sizeof(args); params[3].buffer.length = 4;
if (args) {
params[3].buffer.pointer = args; params[3].buffer.pointer = args;
} else { } else {
// this function does not accept arguments. Pass an empty one // Some implementations (Asus U36SD) seem to check the args before the
params[3].type = ACPI_TYPE_INTEGER; // function ID and crash if it is not a buffer.
params[3].buffer.pointer = 0; params[3].buffer.pointer = (char[4]){0, 0, 0, 0};
} }
err = acpi_evaluate_object(handle, "_DSM", &input, &output); err = acpi_evaluate_object(handle, "_DSM", &input, &output);