5 files changed, 23 insertions, 11 deletions

diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index e73c6755a5eb..70304220a479 100644
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -305,6 +305,8 @@ static struct ichx_desc ich6_desc = {
 
         .ngpio = 50,
         .have_blink = true,
+        .regs = ichx_regs,
+        .reglen = ichx_reglen,
 };
 
 /* Intel 3100 */
@@ -324,6 +326,8 @@ static struct ichx_desc i3100_desc = {
         .uses_gpe0 = true,
 
         .ngpio = 50,
+        .regs = ichx_regs,
+        .reglen = ichx_reglen,
 };
 
 /* ICH7 and ICH8-based */
diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 99a68310e7c0..3d53fd6880d1 100644
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -894,9 +894,11 @@ static int mcp23s08_probe(struct spi_device *spi)
                         dev_err(&spi->dev, "invalid spi-present-mask\n");
                         return -ENODEV;
                 }
-
-                for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++)
+                for (addr = 0; addr < ARRAY_SIZE(pdata->chip); addr++) {
+                        if ((spi_present_mask & (1 << addr)))
+                                chips++;
                         pullups[addr] = 0;
+                }
         } else {
                 type = spi_get_device_id(spi)->driver_data;
                 pdata = dev_get_platdata(&spi->dev);
@@ -919,12 +921,12 @@ static int mcp23s08_probe(struct spi_device *spi)
                         pullups[addr] = pdata->chip[addr].pullups;
                 }
 
-                if (!chips)
-                        return -ENODEV;
-
                 base = pdata->base;
         }
 
+        if (!chips)
+                return -ENODEV;
+
         data = kzalloc(sizeof(*data) + chips * sizeof(struct mcp23s08),
                         GFP_KERNEL);
         if (!data)
diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c
index e9a0415834ea..30bcc539425d 100644
--- a/drivers/gpio/gpio-spear-spics.c
+++ b/drivers/gpio/gpio-spear-spics.c
@@ -2,7 +2,7 @@
  * SPEAr platform SPI chipselect abstraction over gpiolib
  *
  * Copyright (C) 2012 ST Microelectronics
- * Shiraz Hashim <shiraz.hashim@st.com>
+ * Shiraz Hashim <shiraz.linux.kernel@gmail.com>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -205,6 +205,6 @@ static int __init spics_gpio_init(void)
 }
 subsys_initcall(spics_gpio_init);
 
-MODULE_AUTHOR("Shiraz Hashim <shiraz.hashim@st.com>");
+MODULE_AUTHOR("Shiraz Hashim <shiraz.linux.kernel@gmail.com>");
 MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction");
 MODULE_LICENSE("GPL");
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index bf0f8b476696..401add28933f 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -233,7 +233,7 @@ static void acpi_gpiochip_request_interrupts(struct acpi_gpio_chip *acpi_gpio)
 {
         struct gpio_chip *chip = acpi_gpio->chip;
 
-        if (!chip->dev || !chip->to_irq)
+        if (!chip->to_irq)
                 return;
 
         INIT_LIST_HEAD(&acpi_gpio->events);
@@ -253,7 +253,7 @@ static void acpi_gpiochip_free_interrupts(struct acpi_gpio_chip *acpi_gpio)
         struct acpi_gpio_event *event, *ep;
         struct gpio_chip *chip = acpi_gpio->chip;
 
-        if (!chip->dev || !chip->to_irq)
+        if (!chip->to_irq)
                 return;
 
         list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) {
@@ -451,7 +451,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
                 if (function == ACPI_WRITE)
                         gpiod_set_raw_value(desc, !!((1 << i) & *value));
                 else
-                        *value |= gpiod_get_raw_value(desc) << i;
+                        *value |= (u64)gpiod_get_raw_value(desc) << i;
         }
 
 out:
@@ -501,6 +501,9 @@ void acpi_gpiochip_add(struct gpio_chip *chip)
         acpi_handle handle;
         acpi_status status;
 
+        if (!chip || !chip->dev)
+                return;
+
         handle = ACPI_HANDLE(chip->dev);
         if (!handle)
                 return;
@@ -531,6 +534,9 @@ void acpi_gpiochip_remove(struct gpio_chip *chip)
         acpi_handle handle;
         acpi_status status;
 
+        if (!chip || !chip->dev)
+                return;
+
         handle = ACPI_HANDLE(chip->dev);
         if (!handle)
                 return;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 761013f8b82f..f48817d97480 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1387,8 +1387,8 @@ static int gpiochip_irq_map(struct irq_domain *d, unsigned int irq,
 {
         struct gpio_chip *chip = d->host_data;
 
-        irq_set_chip_and_handler(irq, chip->irqchip, chip->irq_handler);
         irq_set_chip_data(irq, chip);
+        irq_set_chip_and_handler(irq, chip->irqchip, chip->irq_handler);
 #ifdef CONFIG_ARM
         set_irq_flags(irq, IRQF_VALID);
 #else