Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75ba899e authored by Mika Westerberg's avatar Mika Westerberg Committed by Jiri Kosina
Browse files

HID: i2c-hid: use correct type for ACPI _DSM parameter 



ACPI 5.0 specification requires the fourth parameter to the _DSM (Device
Specific Method) to be of type package instead of integer. Failing to do
that we get following warning on the console:

  ACPI Warning: \_SB_.PCI0.I2C1.TPL0._DSM: Argument #4 type mismatch - Found [Integer],
                ACPI requires [Package] (20130517/nsarguments-95)

Fix this by passing an empty package to the _DSM method. The HID over I2C
specification doesn't require any specific values to be passed with this
parameter.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 58c59bc9

drivers/hid/i2c-hid/i2c-hid.c

+3 −2
Original line number Diff line number Diff line
@@ -897,8 +897,9 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client, 
	params[1].integer.value = 1;

	params[2].type = ACPI_TYPE_INTEGER;

	params[2].integer.value = 1; /* HID function */

	params[3].type = ACPI_TYPE_INTEGER;

	params[3].integer.value = 0;

	params[3].type = ACPI_TYPE_PACKAGE;

	params[3].package.count = 0;

	params[3].package.elements = NULL;



	if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) {

		dev_err(&client->dev, "device _DSM execution failed\n");