lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpio: pl061: fix probe error handling code

Browse Source 
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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Baruch Siach
2009-06-30 11:41:38 -07:00
committed by Linus Torvalds
parent 66918dcdf9
commit 79d7f4ee23
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpio/pl061.c
View File

@@ -221,7 +221,7 @@ static int __init pl061_probe(struct amba_device *dev, struct amba_id *id)
struct pl061_gpio *chip; struct pl061_gpio *chip;
struct list_head *chip_list; struct list_head *chip_list;
int ret, irq, i; 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; pdata = dev->dev.platform_data;
if (pdata == NULL) 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? */ if (!test_and_set_bit(irq, init_irq)) { /* list initialized? */
chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL); chip_list = kmalloc(sizeof(*chip_list), GFP_KERNEL);
if (chip_list == NULL) { if (chip_list == NULL) {
clear_bit(irq, init_irq);
ret = -ENOMEM; ret = -ENOMEM;
goto iounmap; goto iounmap;
} }