diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-07-30 01:03:42 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-07-31 18:43:43 +0300 |
| commit | f7368a550275ee56da70fd4d603d5a3eb4b614e9 (patch) | |
| tree | d5ccb5d60a894f647352b6b07ae259d1523236d7 /drivers/pci/irq.c | |
| parent | a8651194f9f61406cb8926feeeb7829258295b2a (diff) | |
| download | linux-f7368a550275ee56da70fd4d603d5a3eb4b614e9.tar.xz | |
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: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/pci/irq.c')
| -rw-r--r-- | drivers/pci/irq.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c index 2a808e10645f..a1de501a2729 100644 --- a/drivers/pci/irq.c +++ b/drivers/pci/irq.c @@ -86,13 +86,17 @@ int pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler, va_list ap; int ret; char *devname; + unsigned long irqflags = IRQF_SHARED; + + if (!handler) + irqflags |= IRQF_ONESHOT; va_start(ap, fmt); devname = kvasprintf(GFP_KERNEL, fmt, ap); va_end(ap); ret = request_threaded_irq(pci_irq_vector(dev, nr), handler, thread_fn, - IRQF_SHARED, devname, dev_id); + irqflags, devname, dev_id); if (ret) kfree(devname); return ret; |