diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-11 11:29:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-11 11:29:59 -0700 |
| commit | 5f351f0637777d01465e43c4426096905fe0ca21 (patch) | |
| tree | aa981f7be1859579470cd4c66cf0a05707a2daea /drivers | |
| parent | e6f0f4546a2027fc6bdb9223e5f3fde431587f5d (diff) | |
| parent | 16a50b1270455a6d41f9f6d8f99a72cf9d76824a (diff) | |
Merge tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull misc fix from Greg Kroah-Hartman:
"Here's a single MEI driver fix that resolves a regression from 3.4
that a number of people have reported (and sent to me in different
patches.)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
mei: pci_resume: set IRQF_ONESHOT for msi request_threaded_irq
Diffstat (limited to 'drivers')
| -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 7de13891e49..783fcd7365b 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, |