diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:51:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:51:55 -0800 |
| commit | 579f50cee1a1c12c0113dac02eb510cdb8c7f5f0 (patch) | |
| tree | 551803521b9223e0ea5744b9341c60711cee9e42 | |
| parent | Merge tag 'for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply (diff) | |
| parent | HSI: Fix PM usage counter unbalance in ssi_hw_init (diff) | |
| download | linux-dev-579f50cee1a1c12c0113dac02eb510cdb8c7f5f0.tar.xz linux-dev-579f50cee1a1c12c0113dac02eb510cdb8c7f5f0.zip | |
Merge tag 'hsi-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI update from Sebastian Reichel:
- runtime PM usage counter fix
* tag 'hsi-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: Fix PM usage counter unbalance in ssi_hw_init
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 7596dc164648..44a3f5660c10 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -424,7 +424,7 @@ static int ssi_hw_init(struct hsi_controller *ssi) struct omap_ssi_controller *omap_ssi = hsi_controller_drvdata(ssi); int err; - err = pm_runtime_get_sync(ssi->device.parent); + err = pm_runtime_resume_and_get(ssi->device.parent); if (err < 0) { dev_err(&ssi->device, "runtime PM failed %d\n", err); return err; |