diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 12:37:06 +0300 |
commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
tree | b459600bfffb55b6693b566f5dff859daa216dbe /drivers/irqchip/irq-gic-v3-its.c | |
parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) | |
download | linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.xz |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/irqchip/irq-gic-v3-its.c')
-rw-r--r-- | drivers/irqchip/irq-gic-v3-its.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index ac7ae2b3cb83..25ceae9f7348 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -719,6 +719,9 @@ static unsigned long *its_lpi_alloc_chunks(int nr_irqs, int *base, int *nr_ids) out: spin_unlock(&lpi_lock); + if (!bitmap) + *base = *nr_ids = 0; + return bitmap; } |