diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/misc/ixp4xx-beeper.c | 3 | ||||
-rw-r--r-- | drivers/macintosh/via-pmu.c | 9 | ||||
-rw-r--r-- | drivers/xen/events.c | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c index 9946d73624b..9dfd6e5f786 100644 --- a/drivers/input/misc/ixp4xx-beeper.c +++ b/drivers/input/misc/ixp4xx-beeper.c | |||
@@ -115,7 +115,8 @@ static int __devinit ixp4xx_spkr_probe(struct platform_device *dev) | |||
115 | input_dev->event = ixp4xx_spkr_event; | 115 | input_dev->event = ixp4xx_spkr_event; |
116 | 116 | ||
117 | err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, | 117 | err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt, |
118 | IRQF_DISABLED | IRQF_TIMER, "ixp4xx-beeper", (void *) dev->id); | 118 | IRQF_DISABLED | IRQF_NO_SUSPEND, "ixp4xx-beeper", |
119 | (void *) dev->id); | ||
119 | if (err) | 120 | if (err) |
120 | goto err_free_device; | 121 | goto err_free_device; |
121 | 122 | ||
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 3d4fc0f7b00..35bc2737412 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -400,11 +400,12 @@ static int __init via_pmu_start(void) | |||
400 | printk(KERN_ERR "via-pmu: can't map interrupt\n"); | 400 | printk(KERN_ERR "via-pmu: can't map interrupt\n"); |
401 | return -ENODEV; | 401 | return -ENODEV; |
402 | } | 402 | } |
403 | /* We set IRQF_TIMER because we don't want the interrupt to be disabled | 403 | /* We set IRQF_NO_SUSPEND because we don't want the interrupt |
404 | * between the 2 passes of driver suspend, we control our own disabling | 404 | * to be disabled between the 2 passes of driver suspend, we |
405 | * for that one | 405 | * control our own disabling for that one |
406 | */ | 406 | */ |
407 | if (request_irq(irq, via_pmu_interrupt, IRQF_TIMER, "VIA-PMU", (void *)0)) { | 407 | if (request_irq(irq, via_pmu_interrupt, IRQF_NO_SUSPEND, |
408 | "VIA-PMU", (void *)0)) { | ||
408 | printk(KERN_ERR "via-pmu: can't request irq %d\n", irq); | 409 | printk(KERN_ERR "via-pmu: can't request irq %d\n", irq); |
409 | return -ENODEV; | 410 | return -ENODEV; |
410 | } | 411 | } |
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 5e1f34892dc..72f91bff29c 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -550,6 +550,7 @@ int bind_ipi_to_irqhandler(enum ipi_vector ipi, | |||
550 | if (irq < 0) | 550 | if (irq < 0) |
551 | return irq; | 551 | return irq; |
552 | 552 | ||
553 | irqflags |= IRQF_NO_SUSPEND; | ||
553 | retval = request_irq(irq, handler, irqflags, devname, dev_id); | 554 | retval = request_irq(irq, handler, irqflags, devname, dev_id); |
554 | if (retval != 0) { | 555 | if (retval != 0) { |
555 | unbind_from_irq(irq); | 556 | unbind_from_irq(irq); |