diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2020-08-11 20:00:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-08-12 11:04:05 +0200 |
| commit | e27b1636e9337d1a1d174b191e53d0f86421a822 (patch) | |
| tree | f2c636c044c75e2de774f916dec6624bb01a5f5f /kernel/irq | |
| parent | Merge tag 'tag-chrome-platform-for-v5.9' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | linux-e27b1636e9337d1a1d174b191e53d0f86421a822.tar.xz linux-e27b1636e9337d1a1d174b191e53d0f86421a822.zip | |
genirq/PM: Always unlock IRQ descriptor in rearm_wake_irq()
rearm_wake_irq() does not unlock the irq descriptor if the interrupt
is not suspended or if wakeup is not enabled on it.
Restucture the exit conditions so the unlock is always ensured.
Fixes: 3a79bc63d9075 ("PCI: irq: Introduce rearm_wake_irq()")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200811180001.80203-1-linux@roeck-us.net
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/pm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c index 8f557fa1f4fe..c6c7e187ae74 100644 --- a/kernel/irq/pm.c +++ b/kernel/irq/pm.c @@ -185,14 +185,18 @@ void rearm_wake_irq(unsigned int irq) unsigned long flags; struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL); - if (!desc || !(desc->istate & IRQS_SUSPENDED) || - !irqd_is_wakeup_set(&desc->irq_data)) + if (!desc) return; + if (!(desc->istate & IRQS_SUSPENDED) || + !irqd_is_wakeup_set(&desc->irq_data)) + goto unlock; + desc->istate &= ~IRQS_SUSPENDED; irqd_set(&desc->irq_data, IRQD_WAKEUP_ARMED); __enable_irq(desc); +unlock: irq_put_desc_busunlock(desc, flags); } |