Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / kernel / irq / proc.c

diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 2abd3a7..692363d 100644 (file)
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -20,11 +20,11 @@ static struct proc_dir_entry *root_irq_dir;
 static int irq_affinity_proc_show(struct seq_file *m, void *v)
 {
        struct irq_desc *desc = irq_to_desc((long)m->private);
-       const struct cpumask *mask = &desc->affinity;
+       const struct cpumask *mask = desc->affinity;
 
 #ifdef CONFIG_GENERIC_PENDING_IRQ
        if (desc->status & IRQ_MOVE_PENDING)
-               mask = &desc->pending_mask;
+               mask = desc->pending_mask;
 #endif
        seq_cpumask(m, mask);
        seq_putc(m, '\n');
@@ -54,7 +54,7 @@ static ssize_t irq_affinity_proc_write(struct file *file,
        if (err)
                goto free_cpumask;
 
-       if (!is_affinity_mask_valid(*new_value)) {
+       if (!is_affinity_mask_valid(new_value)) {
                err = -EINVAL;
                goto free_cpumask;
        }