kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'regmap-5.3' into regmap-linus

Browse source
This commit is contained in:
Mark Brown 2019-08-12 14:10:40 +01:00
commit 0161b87164
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/base/regmap/regmap-irq.c
View file

@ -370,7 +370,6 @@ 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);
goto exit; goto exit;
} }
} }
@ -425,8 +424,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
dev_err(map->dev, dev_err(map->dev,
"Failed to read IRQ status %d\n", "Failed to read IRQ status %d\n",
ret); ret);
if (chip->runtime_pm)
pm_runtime_put(map->dev);
goto exit; goto exit;
} }
} }
@ -478,8 +475,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
dev_err(map->dev, dev_err(map->dev,
"Failed to read IRQ status: %d\n", "Failed to read IRQ status: %d\n",
ret); ret);
if (chip->runtime_pm)
pm_runtime_put(map->dev);
goto exit; goto exit;
} }
} }
@ -513,10 +508,10 @@ static irqreturn_t regmap_irq_thread(int irq, void *d)
} }
} }
exit:
if (chip->runtime_pm) if (chip->runtime_pm)
pm_runtime_put(map->dev); pm_runtime_put(map->dev);
exit:
if (chip->handle_post_irq) if (chip->handle_post_irq)
chip->handle_post_irq(chip->irq_drv_data); chip->handle_post_irq(chip->irq_drv_data);