Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e82cff75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes-for-linus' of... 

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: NULL struct irq_desc's member 'name' in dynamic_irq_cleanup()
  genirq: fix off by one and coding style
  genirq: fix set_irq_type() when recording trigger type
parents b80de369 b6f3b780

include/linux/irqnr.h

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ extern int nr_irqs; 


# define for_each_irq_desc_reverse(irq, desc)				\

	for (irq = nr_irqs - 1, desc = irq_desc + (nr_irqs - 1);	\

	     irq > 0; irq--, desc--)

	     irq >= 0; irq--, desc--)

#endif



#define for_each_irq_nr(irq)			\

kernel/irq/chip.c

+2 −1
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ void dynamic_irq_cleanup(unsigned int irq) 
	desc->chip_data = NULL;

	desc->handle_irq = handle_bad_irq;

	desc->chip = &no_irq_chip;

	desc->name = NULL;

	spin_unlock_irqrestore(&desc->lock, flags);

}
@@ -127,7 +128,7 @@ int set_irq_type(unsigned int irq, unsigned int type) 
		return 0;



	spin_lock_irqsave(&desc->lock, flags);

	ret = __irq_set_trigger(desc, irq, flags);

	ret = __irq_set_trigger(desc, irq, type);

	spin_unlock_irqrestore(&desc->lock, flags);

	return ret;

}

arch/x86/kernel/irq.c

+2 −2

File changed.

Contains only whitespace changes.