Commit af906faabcf91eb1 ("Input: gpio_keys - fix warning regarding uninitialized
'irq' variable") introduced the following build warning:

drivers/input/keyboard/gpio_keys.c:625:16: warning: 'button' may be used 
uninitialized in this function [-Wmaybe-uninitialized]

Move the 'button' initialization to a proper location to avoid such warning.

Reported-by: Olof's autobuilder <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
---
 drivers/input/keyboard/gpio_keys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/keyboard/gpio_keys.c 
b/drivers/input/keyboard/gpio_keys.c
index fb8256f..28ac922 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -621,6 +621,8 @@ gpio_keys_get_devtree_pdata(struct device *dev)
                int gpio = -1;
                enum of_gpio_flags flags;
 
+               button = &pdata->buttons[i++];
+
                if (!of_find_property(pp, "gpios", NULL)) {
                        button->irq = irq_of_parse_and_map(pp, 0);
                        if (button->irq == 0) {
@@ -640,8 +642,6 @@ gpio_keys_get_devtree_pdata(struct device *dev)
                        }
                }
 
-               button = &pdata->buttons[i++];
-
                button->gpio = gpio;
                button->active_low = flags & OF_GPIO_ACTIVE_LOW;
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to