Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index d62eaaa75397..687476fb39e3 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -377,8 +377,10 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
         struct gpio_chip *chip = achip->chip;
         struct acpi_resource_gpio *agpio;
         struct acpi_resource *ares;
+        int pin_index = (int)address;
         acpi_status status;
         bool pull_up;
+        int length;
         int i;
 
         status = acpi_buffer_to_resource(achip->conn_info.connection,
@@ -400,7 +402,8 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                 return AE_BAD_PARAMETER;
         }
 
-        for (i = 0; i < agpio->pin_table_length; i++) {
+        length = min(agpio->pin_table_length, (u16)(pin_index + bits));
+        for (i = pin_index; i < length; ++i) {
                 unsigned pin = agpio->pin_table[i];
                 struct acpi_gpio_connection *conn;
                 struct gpio_desc *desc;