diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /kernel/irq/manage.c | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
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 e1497481fe8a..c3003e9d91a3 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -216,7 +216,7 @@ static inline int setup_affinity(unsigned int irq, struct irq_desc *desc) | |||
| 216 | void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) | 216 | void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend) |
| 217 | { | 217 | { |
| 218 | if (suspend) { | 218 | if (suspend) { |
| 219 | if (!desc->action || (desc->action->flags & IRQF_TIMER)) | 219 | if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND)) |
| 220 | return; | 220 | return; |
| 221 | desc->status |= IRQ_SUSPENDED; | 221 | desc->status |= IRQ_SUSPENDED; |
| 222 | } | 222 | } |