Commit cbdd17b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:

 - imx-lpi2c: fix clock error handling sequence in probe

* tag 'i2c-for-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: imx-lpi2c: Fix clock count when probe defers
parents 2a239ffb 8e17493e

drivers/i2c/busses/i2c-imx-lpi2c.c

+2 −2
Original line number Diff line number Diff line
@@ -1380,9 +1380,9 @@ static int lpi2c_imx_probe(struct platform_device *pdev) 
	return 0;



rpm_disable:

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_dont_use_autosuspend(&pdev->dev);

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	return ret;

}