|
@@ -360,7 +360,7 @@ static unsigned long *gpiochip_allocate_mask(struct gpio_chip *chip)
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
-static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)
|
|
|
+static int gpiochip_alloc_valid_mask(struct gpio_chip *gpiochip)
|
|
|
{
|
|
|
#ifdef CONFIG_OF_GPIO
|
|
|
int size;
|
|
@@ -381,6 +381,14 @@ static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int gpiochip_init_valid_mask(struct gpio_chip *gpiochip)
|
|
|
+{
|
|
|
+ if (gpiochip->init_valid_mask)
|
|
|
+ return gpiochip->init_valid_mask(gpiochip);
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static void gpiochip_free_valid_mask(struct gpio_chip *gpiochip)
|
|
|
{
|
|
|
kfree(gpiochip->valid_mask);
|
|
@@ -1369,7 +1377,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
|
|
|
if (status)
|
|
|
goto err_remove_from_list;
|
|
|
|
|
|
- status = gpiochip_init_valid_mask(chip);
|
|
|
+ status = gpiochip_alloc_valid_mask(chip);
|
|
|
if (status)
|
|
|
goto err_remove_irqchip_mask;
|
|
|
|
|
@@ -1381,6 +1389,10 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data,
|
|
|
if (status)
|
|
|
goto err_remove_chip;
|
|
|
|
|
|
+ status = gpiochip_init_valid_mask(chip);
|
|
|
+ if (status)
|
|
|
+ goto err_remove_chip;
|
|
|
+
|
|
|
acpi_gpiochip_add(chip);
|
|
|
|
|
|
machine_gpiochip_add(chip);
|