mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 14:14:37 +00:00
Code Issues Releases Wiki Activity

Input: gpio_keys - fix warning regarding uninitialized 'irq' variable

Browse source 
Commit f2d347ff70 ("Input: gpio_keys - add device tree support for
interrupt only keys") caused the following build warning:

drivers/input/keyboard/gpio_keys.c: In function 'gpio_keys_probe':
drivers/input/keyboard/gpio_keys.c:647:15: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]
drivers/input/keyboard/gpio_keys.c:622:7: note: 'irq' was declared here

Move button->irq initialization into proper branch and get rid of the
temporary.

Reported-by: Olof's autobuilder <build@lixom.net>
Reported-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2014-12-07 22:42:45 -08:00
parent 823a11fdbd
commit af906faabc
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/input/keyboard/gpio_keys.c
View file

@ -619,12 +619,11 @@ gpio_keys_get_devtree_pdata(struct device *dev)
i = 0;
for_each_child_of_node(node, pp) {
int gpio = -1;
int irq;
enum of_gpio_flags flags;
if (!of_find_property(pp, "gpios", NULL)) {
irq = irq_of_parse_and_map(pp, 0);
if (irq == 0) {
button->irq = irq_of_parse_and_map(pp, 0);
if (button->irq == 0) {
pdata->nbuttons--;
dev_warn(dev, "Found button without gpios or irqs\n");
continue;
@ -644,7 +643,6 @@ gpio_keys_get_devtree_pdata(struct device *dev)
button = &pdata->buttons[i++];
button->gpio = gpio;
button->irq = irq;
button->active_low = flags & OF_GPIO_ACTIVE_LOW;
if (of_property_read_u32(pp, "linux,code", &button->code)) {