Commit 0c8150d2 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-v3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap PM fix from Mark Brown:
 "A simple fix to stop us leaking a runtime PM reference in the case
  where we fail to enable a device."

* tag 'regmap-v3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: irq: call pm_runtime_put in pm_runtime_get_sync failed case
parents e2e091fd 283189d3
...@@ -184,6 +184,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) ...@@ -184,6 +184,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
if (ret < 0) { if (ret < 0) {
dev_err(map->dev, "IRQ thread failed to resume: %d\n", dev_err(map->dev, "IRQ thread failed to resume: %d\n",
ret); ret);
pm_runtime_put(map->dev);
return IRQ_NONE; return IRQ_NONE;
} }
} }
......
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