Commit 579f50ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a7dcf5f2 aa57e77b

drivers/hsi/controllers/omap_ssi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;