1 files changed, 27 insertions, 22 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 2aa3d4b2fce8..a4bb0da9c88c 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -27,13 +27,13 @@ void dynamic_irq_init(unsigned int irq)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = irq_to_desc(irq);
+        if (!desc) {
                 WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
                 return;
         }
 
         /* Ensure we don't have left over values from a previous use of this irq */
-        desc = irq_to_desc(irq);
         spin_lock_irqsave(&desc->lock, flags);
         desc->status = IRQ_DISABLED;
         desc->chip = &no_irq_chip;
@@ -60,12 +60,12 @@ void dynamic_irq_cleanup(unsigned int irq)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
                 return;
         }
 
-        desc = irq_to_desc(irq);
         spin_lock_irqsave(&desc->lock, flags);
         if (desc->action) {
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -92,7 +92,8 @@ int set_irq_chip(unsigned int irq, struct irq_chip *chip)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 WARN(1, KERN_ERR "Trying to install chip for IRQ%d\n", irq);
                 return -EINVAL;
         }
@@ -121,12 +122,12 @@ int set_irq_type(unsigned int irq, unsigned int type)
         unsigned long flags;
         int ret = -ENXIO;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR "Trying to set irq type for IRQ%d\n", irq);
                 return -ENODEV;
         }
 
-        desc = irq_to_desc(irq);
         if (type == IRQ_TYPE_NONE)
                 return 0;
 
@@ -149,13 +150,13 @@ int set_irq_data(unsigned int irq, void *data)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR
                        "Trying to install controller data for IRQ%d\n", irq);
                 return -EINVAL;
         }
 
-        desc = irq_to_desc(irq);
         spin_lock_irqsave(&desc->lock, flags);
         desc->handler_data = data;
         spin_unlock_irqrestore(&desc->lock, flags);
@@ -175,12 +176,13 @@ int set_irq_msi(unsigned int irq, struct msi_desc *entry)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR
                        "Trying to install msi data for IRQ%d\n", irq);
                 return -EINVAL;
         }
-        desc = irq_to_desc(irq);
+
         spin_lock_irqsave(&desc->lock, flags);
         desc->msi_desc = entry;
         if (entry)
@@ -201,8 +203,14 @@ int set_irq_chip_data(unsigned int irq, void *data)
         struct irq_desc *desc;
         unsigned long flags;
 
-        desc = irq_to_desc(irq);
-        if (irq >= nr_irqs || !desc->chip) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
+                printk(KERN_ERR
+                       "Trying to install chip data for IRQ%d\n", irq);
+                return -EINVAL;
+        }
+
+        if (!desc->chip) {
                 printk(KERN_ERR "BUG: bad set_irq_chip_data(IRQ#%d)\n", irq);
                 return -EINVAL;
         }
@@ -546,14 +554,13 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR
                        "Trying to install type control for IRQ%d\n", irq);
                 return;
         }
 
-        desc = irq_to_desc(irq);
-
         if (!handle)
                 handle = handle_bad_irq;
         else if (desc->chip == &no_irq_chip) {
@@ -611,14 +618,13 @@ void __init set_irq_noprobe(unsigned int irq)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR "Trying to mark IRQ%d non-probeable\n", irq);
 
                 return;
         }
 
-        desc = irq_to_desc(irq);
-
         spin_lock_irqsave(&desc->lock, flags);
         desc->status |= IRQ_NOPROBE;
         spin_unlock_irqrestore(&desc->lock, flags);
@@ -629,14 +635,13 @@ void __init set_irq_probe(unsigned int irq)
         struct irq_desc *desc;
         unsigned long flags;
 
-        if (irq >= nr_irqs) {
+        desc = __irq_to_desc(irq);
+        if (!desc) {
                 printk(KERN_ERR "Trying to mark IRQ%d probeable\n", irq);
 
                 return;
         }
 
-        desc = irq_to_desc(irq);
-
         spin_lock_irqsave(&desc->lock, flags);
         desc->status &= ~IRQ_NOPROBE;
         spin_unlock_irqrestore(&desc->lock, flags);