1 files changed, 2 insertions, 9 deletions

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 4e1b94726818..feaa813b84a9 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -96,7 +96,7 @@ static ssize_t write_irq_affinity(int type, struct file *file,
         cpumask_var_t new_value;
         int err;
 
-        if (!irq_can_set_affinity(irq) || no_irq_affinity)
+        if (!irq_can_set_affinity_usr(irq) || no_irq_affinity)
                 return -EIO;
 
         if (!alloc_cpumask_var(&new_value, GFP_KERNEL))
@@ -311,7 +311,6 @@ void register_handler_proc(unsigned int irq, struct irqaction *action)
                                         !name_unique(irq, action))
                 return;
 
-        memset(name, 0, MAX_NAMELEN);
         snprintf(name, MAX_NAMELEN, "%s", action->name);
 
         /* create /proc/irq/1234/handler/ */
@@ -340,7 +339,6 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc)
         if (desc->dir)
                 goto out_unlock;
 
-        memset(name, 0, MAX_NAMELEN);
         sprintf(name, "%d", irq);
 
         /* create /proc/irq/1234 */
@@ -386,7 +384,6 @@ void unregister_irq_proc(unsigned int irq, struct irq_desc *desc)
 #endif
         remove_proc_entry("spurious", desc->dir);
 
-        memset(name, 0, MAX_NAMELEN);
         sprintf(name, "%u", irq);
         remove_proc_entry(name, root_irq_dir);
 }
@@ -421,12 +418,8 @@ void init_irq_proc(void)
         /*
          * Create entries for all existing IRQs.
          */
-        for_each_irq_desc(irq, desc) {
-                if (!desc)
-                        continue;
-
+        for_each_irq_desc(irq, desc)
                 register_irq_proc(irq, desc);
-        }
 }
 
 #ifdef CONFIG_GENERIC_IRQ_SHOW