Skip to content

Commit

Permalink
Input: gpio_keys - fix warning regarding uninitialized 'button' variable
Browse files Browse the repository at this point in the history
Commit af906fa ("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 <build@lixom.net>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Fabio Estevam authored and Dmitry Torokhov committed Dec 14, 2014
1 parent 66aee90 commit 1d6a013
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/input/keyboard/gpio_keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,9 +621,12 @@ 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) {
i--;
pdata->nbuttons--;
dev_warn(dev, "Found button without gpios or irqs\n");
continue;
Expand All @@ -640,8 +643,6 @@ gpio_keys_get_devtree_pdata(struct device *dev)
}
}

button = &pdata->buttons[i++];

button->gpio = gpio;
button->active_low = flags & OF_GPIO_ACTIVE_LOW;

Expand Down

0 comments on commit 1d6a013

Please sign in to comment.