diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 16:06:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-07 16:06:21 -0500 |
| commit | 0c8150d2c404a13161eb9e0ff3d9df4838de2a6d (patch) | |
| tree | d20061fe73a9d44c869807c7cb556517607391eb /drivers/base | |
| parent | e2e091fd99400029120eeefde062fdf417ab37f6 (diff) | |
| parent | 283189d3be56aa6db6f192bb255df68493cd79ac (diff) | |
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
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index 4706c63d0bc6..020ea2b9fd2f 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/drivers/base/regmap/regmap-irq.c | |||
| @@ -184,6 +184,7 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) | |||
| 184 | if (ret < 0) { | 184 | if (ret < 0) { |
| 185 | dev_err(map->dev, "IRQ thread failed to resume: %d\n", | 185 | dev_err(map->dev, "IRQ thread failed to resume: %d\n", |
| 186 | ret); | 186 | ret); |
| 187 | pm_runtime_put(map->dev); | ||
| 187 | return IRQ_NONE; | 188 | return IRQ_NONE; |
| 188 | } | 189 | } |
| 189 | } | 190 | } |