diff options
author | Pali Rohár <pali.rohar@gmail.com> | 2017-08-12 03:44:18 -0400 |
---|---|---|
committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-08-18 08:10:40 -0400 |
commit | 6afa1e2a32f4bd28df4cbe75454fde837dad4c09 (patch) | |
tree | 6636cb72b0cd721e3d2ab3d37c47ce34c69d3db2 | |
parent | ade50296186a1c45311d05a06117a2bd112d37fd (diff) |
platform/x86: wmi: Fix check for method instance number
instance_count defines number of instances of data block and instance
itself is indexed from zero, which means first instance has number 0.
Therefore check for invalid instance should be non-strict inequality.
Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Reviewed-by: Darren Hart (VMware) <dvhart@infradead.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r-- | drivers/platform/x86/wmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index e32ba575e8d9..0765b1797d4c 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
@@ -218,7 +218,7 @@ u32 method_id, const struct acpi_buffer *in, struct acpi_buffer *out) | |||
218 | if (!(block->flags & ACPI_WMI_METHOD)) | 218 | if (!(block->flags & ACPI_WMI_METHOD)) |
219 | return AE_BAD_DATA; | 219 | return AE_BAD_DATA; |
220 | 220 | ||
221 | if (block->instance_count < instance) | 221 | if (block->instance_count <= instance) |
222 | return AE_BAD_PARAMETER; | 222 | return AE_BAD_PARAMETER; |
223 | 223 | ||
224 | input.count = 2; | 224 | input.count = 2; |
@@ -265,7 +265,7 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance, | |||
265 | block = &wblock->gblock; | 265 | block = &wblock->gblock; |
266 | handle = wblock->acpi_device->handle; | 266 | handle = wblock->acpi_device->handle; |
267 | 267 | ||
268 | if (block->instance_count < instance) | 268 | if (block->instance_count <= instance) |
269 | return AE_BAD_PARAMETER; | 269 | return AE_BAD_PARAMETER; |
270 | 270 | ||
271 | /* Check GUID is a data block */ | 271 | /* Check GUID is a data block */ |
@@ -392,7 +392,7 @@ acpi_status wmi_set_block(const char *guid_string, u8 instance, | |||
392 | block = &wblock->gblock; | 392 | block = &wblock->gblock; |
393 | handle = wblock->acpi_device->handle; | 393 | handle = wblock->acpi_device->handle; |
394 | 394 | ||
395 | if (block->instance_count < instance) | 395 | if (block->instance_count <= instance) |
396 | return AE_BAD_PARAMETER; | 396 | return AE_BAD_PARAMETER; |
397 | 397 | ||
398 | /* Check GUID is a data block */ | 398 | /* Check GUID is a data block */ |