Merge tag 'pinctrl-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / drivers / pinctrl / qcom / pinctrl-spmi-gpio.c

diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index e01a556ac586cd1b83fbe1f887063db48fbab394..76e57ae2f6e84b8b7cdf5b71965aab0be258d005 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@ -675,11 +675,11 @@ static void pmic_gpio_config_dbg_show(struct pinctrl_dev *pctldev,
                else
                        seq_printf(s, " %-4s",
                                        pad->output_enabled ? "out" : "in");
+               seq_printf(s, " %-4s", pad->out_value ? "high" : "low");
                seq_printf(s, " %-7s", pmic_gpio_functions[function]);
                seq_printf(s, " vin-%d", pad->power_source);
                seq_printf(s, " %-27s", biases[pad->pullup]);
                seq_printf(s, " %-10s", buffer_types[pad->buffer_type]);
-               seq_printf(s, " %-4s", pad->out_value ? "high" : "low");
                seq_printf(s, " %-7s", strengths[pad->strength]);
                seq_printf(s, " atest-%d", pad->atest);
                seq_printf(s, " dtest-%d", pad->dtest_buffer);
@@ -962,7 +962,8 @@ static int pmic_gpio_domain_translate(struct irq_domain *domain,
                                                     struct pmic_gpio_state,
                                                     chip);
 
-       if (fwspec->param_count != 2 || fwspec->param[0] >= state->chip.ngpio)
+       if (fwspec->param_count != 2 ||
+           fwspec->param[0] < 1 || fwspec->param[0] > state->chip.ngpio)
                return -EINVAL;
 
        *hwirq = fwspec->param[0] - PMIC_GPIO_PHYSICAL_OFFSET;