summaryrefslogtreecommitdiff
path: root/drivers/gpio/gpiolib-acpi.c
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2015-06-11 07:52:14 +0300
committerZhang Rui <rui.zhang@intel.com>2015-06-11 07:52:14 +0300
commit111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch)
tree89b840115ccd753216ba0b26e587e52699b99310 /drivers/gpio/gpiolib-acpi.c
parent6a6bcf08e5d1834447655a762dfaf552b675cc54 (diff)
parent53daf9383f34d7bf61358a37449fb4d59fbdafc2 (diff)
downloadlinux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'drivers/gpio/gpiolib-acpi.c')
-rw-r--r--drivers/gpio/gpiolib-acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index d2303d50f561..725d16138b74 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -550,7 +550,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
length = min(agpio->pin_table_length, (u16)(pin_index + bits));
for (i = pin_index; i < length; ++i) {
- unsigned pin = agpio->pin_table[i];
+ int pin = agpio->pin_table[i];
struct acpi_gpio_connection *conn;
struct gpio_desc *desc;
bool found;