diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-15 20:49:21 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-15 20:49:21 (GMT) |
commit | d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0 (patch) | |
tree | 79e832eb50d3b416bdada4903b2a2e2fefcc2800 /drivers/misc/mei/main.c | |
parent | 7c7fac30581b2fe2e0783d9b6f53ca333cc2296c (diff) | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
download | linux-fsl-qoriq-d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0.tar.xz |
Merge tag 'v3.5-rc7' into regulator-drivers
Linux 3.5-rc7
Diffstat (limited to 'drivers/misc/mei/main.c')
-rw-r--r-- | drivers/misc/mei/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 7de1389..783fcd7 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -1147,7 +1147,7 @@ static int mei_pci_resume(struct device *device) err = request_threaded_irq(pdev->irq, NULL, mei_interrupt_thread_handler, - 0, mei_driver_name, dev); + IRQF_ONESHOT, mei_driver_name, dev); else err = request_threaded_irq(pdev->irq, mei_interrupt_quick_handler, |