diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
| commit | e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch) | |
| tree | 8b23624cc792f60d0bf86d787c3514cf0fb04418 /kernel/irq/manage.c | |
| parent | adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff) | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index bde4c667d24d..7305b297d1eb 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -1067,7 +1067,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, | |||
| 1067 | kfree(action); | 1067 | kfree(action); |
| 1068 | 1068 | ||
| 1069 | #ifdef CONFIG_DEBUG_SHIRQ | 1069 | #ifdef CONFIG_DEBUG_SHIRQ |
| 1070 | if (irqflags & IRQF_SHARED) { | 1070 | if (!retval && (irqflags & IRQF_SHARED)) { |
| 1071 | /* | 1071 | /* |
| 1072 | * It's a shared IRQ -- the driver ought to be prepared for it | 1072 | * It's a shared IRQ -- the driver ought to be prepared for it |
| 1073 | * to happen immediately, so let's make sure.... | 1073 | * to happen immediately, so let's make sure.... |