diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2013-08-19 07:01:17 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-08-20 06:25:49 -0400 |
commit | 75ba899e95217fe9002878edc2777bdd49d908c3 (patch) | |
tree | 238abbd229975e0c10d95c2e4493b17c082cc5c1 /drivers/hid/i2c-hid | |
parent | 58c59bc997d86593f0bea41845885917cf304d22 (diff) |
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: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/i2c-hid')
-rw-r--r-- | drivers/hid/i2c-hid/i2c-hid.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 879b0ed701a3..d2e0eea2bf79 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c | |||
@@ -897,8 +897,9 @@ static int i2c_hid_acpi_pdata(struct i2c_client *client, | |||
897 | params[1].integer.value = 1; | 897 | params[1].integer.value = 1; |
898 | params[2].type = ACPI_TYPE_INTEGER; | 898 | params[2].type = ACPI_TYPE_INTEGER; |
899 | params[2].integer.value = 1; /* HID function */ | 899 | params[2].integer.value = 1; /* HID function */ |
900 | params[3].type = ACPI_TYPE_INTEGER; | 900 | params[3].type = ACPI_TYPE_PACKAGE; |
901 | params[3].integer.value = 0; | 901 | params[3].package.count = 0; |
902 | params[3].package.elements = NULL; | ||
902 | 903 | ||
903 | if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) { | 904 | if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DSM", &input, &buf))) { |
904 | dev_err(&client->dev, "device _DSM execution failed\n"); | 905 | dev_err(&client->dev, "device _DSM execution failed\n"); |