gpio: pl061: fix probe error handling code (79d7f4ee) · Commits · 戴 / test

Note that IRQ has not been initialized when kmalloc() fails. Also, use DECLARE_BITMAP() to make the code clearer. Signed-off-by:

Baruch Siach <baruch@tkos.co.il> Cc: David Brownell <david-b@pacbell.net> Signed-off-by:

drivers/gpio/pl061.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ static int __init pl061_probe(struct amba_device dev, struct amba_id id)
		struct pl061_gpio *chip;
		struct list_head *chip_list;
		int ret, irq, i;
		static unsigned long init_irq[BITS_TO_LONGS(NR_IRQS)];
		static DECLARE_BITMAP(init_irq, NR_IRQS);

		pdata = dev->dev.platform_data;
		if (pdata == NULL)
		@@ -280,6 +280,7 @@ static int __init pl061_probe(struct amba_device dev, struct amba_id id)
		if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */
		chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL);
		if (chip_list == NULL) {
		clear_bit(irq, init_irq);
		ret = -ENOMEM;
		goto iounmap;
		}