|
@@ -854,10 +854,10 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client,
|
|
|
0xF7, 0xF6, 0xDF, 0x3C, 0x67, 0x42, 0x55, 0x45,
|
|
|
0xAD, 0x05, 0xB3, 0x0A, 0x3D, 0x89, 0x38, 0xDE,
|
|
|
};
|
|
|
- struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
|
|
|
- union acpi_object params[4], *obj;
|
|
|
+ union acpi_object params[4];
|
|
|
struct acpi_object_list input;
|
|
|
struct acpi_device *adev;
|
|
|
+ unsigned long long value;
|
|
|
acpi_handle handle;
|
|
|
|
|
|
handle = ACPI_HANDLE(&client->dev);
|
|
@@ -878,22 +878,14 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client,
|
|
|
params[3].package.count = 0;
|
|
|
params[3].package.elements = NULL;
|
|
|
|
|
|
- if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) {
|
|
|
+ if (ACPI_FAILURE(acpi_evaluate_integer(handle, "_DSM", &input,
|
|
|
+ &value))) {
|
|
|
dev_err(&client->dev, "device _DSM execution failed\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
- obj = (union acpi_object *)buf.pointer;
|
|
|
- if (obj->type != ACPI_TYPE_INTEGER) {
|
|
|
- dev_err(&client->dev, "device _DSM returned invalid type: %d\n",
|
|
|
- obj->type);
|
|
|
- kfree(buf.pointer);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- pdata->hid_descriptor_address = obj->integer.value;
|
|
|
+ pdata->hid_descriptor_address = value;
|
|
|
|
|
|
- kfree(buf.pointer);
|
|
|
return 0;
|
|
|
}
|
|
|
|