1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 3aaf406b67b8..851c773feae1 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -455,9 +455,16 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
                 return;
 
         bitmap_zero(map.bits, PNP_IRQ_NR);
-        for (i = 0; i < p->interrupt_count; i++)
-                if (p->interrupts[i])
-                        __set_bit(p->interrupts[i], map.bits);
+        for (i = 0; i < p->interrupt_count; i++) {
+                if (p->interrupts[i]) {
+                        if (p->interrupts[i] < PNP_IRQ_NR)
+                                __set_bit(p->interrupts[i], map.bits);
+                        else
+                                dev_err(&dev->dev, "ignoring IRQ %d option "
+                                        "(too large for %d entry bitmap)\n",
+                                        p->interrupts[i], PNP_IRQ_NR);
+                }
+        }
 
         flags = irq_flags(p->triggering, p->polarity, p->sharable);
         pnp_register_irq_resource(dev, option, &map, flags);