Skip to content

Commit cbdd17b

Browse files
committed
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
2 parents 2a239ff + 8e17493 commit cbdd17b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,9 +1380,9 @@ static int lpi2c_imx_probe(struct platform_device *pdev)
13801380
return 0;
13811381

13821382
rpm_disable:
1383-
pm_runtime_put(&pdev->dev);
1384-
pm_runtime_disable(&pdev->dev);
13851383
pm_runtime_dont_use_autosuspend(&pdev->dev);
1384+
pm_runtime_put_sync(&pdev->dev);
1385+
pm_runtime_disable(&pdev->dev);
13861386

13871387
return ret;
13881388
}

0 commit comments

Comments
 (0)