diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:36:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 09:36:55 -0700 |
| commit | e82cff752f57810a2259415ad2e9087c2d69484c (patch) | |
| tree | 9c93e9b2e42c9a95fd6d75010ac958ed9cf1dd40 /kernel | |
| parent | b80de369aa5c7c8ce7ff7a691e86e1dcc89accc6 (diff) | |
| parent | b6f3b7803a9231eddc36d0a2a6d2d8105ef89344 (diff) | |
| download | linux-e82cff752f57810a2259415ad2e9087c2d69484c.tar.bz2 | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/chip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 4895fde4eb93..10b5092e9bfe 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -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; } |