diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-11 16:08:17 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-05-11 16:08:17 +0000 |
commit | ba4e63325c88889dc147563e5d7e33223389794e (patch) | |
tree | 1222d62f37c1c12a167f3cc47bdb85bb5359ec25 /drivers/mfd | |
parent | 3ec285efe932699470c60430ea53d8753d705891 (diff) | |
parent | 16022114de9869743d6304290815cdb8a8c7deaa (diff) |
Merge tag 'v5.4.118' into 5.4-2.3.x-imx
This is the 5.4.118 stable release
Conflicts (manual resolve):
- drivers/mmc/core/core.c:
- drivers/mmc/core/host.c:
Fix merge fuzz for upstream commit 909a01b95120 ("mmc: core: Fix hanging
on I/O during system suspend for removable cards")
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/arizona-irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 077d9ab112b7..d919ae9691e2 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c @@ -100,7 +100,7 @@ static irqreturn_t arizona_irq_thread(int irq, void *data) unsigned int val; int ret; - ret = pm_runtime_get_sync(arizona->dev); + ret = pm_runtime_resume_and_get(arizona->dev); if (ret < 0) { dev_err(arizona->dev, "Failed to resume device: %d\n", ret); return IRQ_NONE; |