Commit f7368a55 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas

PCI: Use IRQF_ONESHOT if pci_request_irq() called with no handler

If we have a threaded interrupt with the handler being NULL, then
request_threaded_irq() -> __setup_irq() will complain and bail out if the
IRQF_ONESHOT flag isn't set.  Therefore check for the handler being NULL
and set IRQF_ONESHOT in this case.

This change is needed to migrate the mei_me driver to
pci_alloc_irq_vectors() and pci_request_irq().
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a8651194
...@@ -86,13 +86,17 @@ int pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler, ...@@ -86,13 +86,17 @@ int pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler,
va_list ap; va_list ap;
int ret; int ret;
char *devname; char *devname;
unsigned long irqflags = IRQF_SHARED;
if (!handler)
irqflags |= IRQF_ONESHOT;
va_start(ap, fmt); va_start(ap, fmt);
devname = kvasprintf(GFP_KERNEL, fmt, ap); devname = kvasprintf(GFP_KERNEL, fmt, ap);
va_end(ap); va_end(ap);
ret = request_threaded_irq(pci_irq_vector(dev, nr), handler, thread_fn, ret = request_threaded_irq(pci_irq_vector(dev, nr), handler, thread_fn,
IRQF_SHARED, devname, dev_id); irqflags, devname, dev_id);
if (ret) if (ret)
kfree(devname); kfree(devname);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment