Skip to content

Commit

Permalink
gpio: mxc: need to check return value of irq_alloc_generic_chip
Browse files Browse the repository at this point in the history
Need to check return value of irq_alloc_generic_chip, because
it may return NULL.
1. Change mxc_gpio_init_gc return type from void to int.
2. Add a new lable out_irqdomain_remove to remove the irq domain
   when mxc_gpio_init_gc fail.

Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
[Manually rebased]
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Peng Fan authored and Linus Walleij committed Sep 14, 2015
1 parent 6ff33f3 commit 9e26b0b
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/gpio/gpio-mxc.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,13 +339,15 @@ static int gpio_set_wake_irq(struct irq_data *d, u32 enable)
return 0;
}

static void mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
static int mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
{
struct irq_chip_generic *gc;
struct irq_chip_type *ct;

gc = irq_alloc_generic_chip("gpio-mxc", 1, irq_base,
port->base, handle_level_irq);
if (!gc)
return -ENOMEM;
gc->private = port;

ct = gc->chip_types;
Expand All @@ -360,6 +362,8 @@ static void mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)

irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_NESTED_LOCK,
IRQ_NOREQUEST, 0);

return 0;
}

static void mxc_gpio_get_hw(struct platform_device *pdev)
Expand Down Expand Up @@ -477,12 +481,16 @@ static int mxc_gpio_probe(struct platform_device *pdev)
}

/* gpio-mxc can be a generic irq chip */
mxc_gpio_init_gc(port, irq_base);
err = mxc_gpio_init_gc(port, irq_base);
if (err < 0)
goto out_irqdomain_remove;

list_add_tail(&port->node, &mxc_gpio_ports);

return 0;

out_irqdomain_remove:
irq_domain_remove(port->domain);
out_irqdesc_free:
irq_free_descs(irq_base, 32);
out_gpiochip_remove:
Expand Down

0 comments on commit 9e26b0b

Please sign in to comment.