diff options
| author | Guoniu.Zhou <guoniu.zhou@nxp.com> | 2017-12-08 19:32:34 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | b613fa4cf7801c8ebd71d74cea2951bcf54ad45e (patch) | |
| tree | 166d1dce1d043d90f440b6c7fc9c760e46c28c7a /drivers/media/platform/imx8 | |
| parent | 67f351ba7de74dbb7074ce3e31991b750a01c917 (diff) | |
MLK-16549-2: ISI: fix suspend/resume error issue
Because ISI runtime suspend has disable clock before system
suspend. If driver does not know that and disable clock again
in system suspend callback. It will lead to isi clk count mis-
match.
Reviewed-by: Sandor.Yu <sandor.yu@nxp.com>
Signed-off-by: Guoniu.Zhou <guoniu.zhou@nxp.com>
Diffstat (limited to 'drivers/media/platform/imx8')
| -rw-r--r-- | drivers/media/platform/imx8/mxc-isi-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/imx8/mxc-isi-core.c b/drivers/media/platform/imx8/mxc-isi-core.c index 1ddf3d9f6759..29a1999edfe5 100644 --- a/drivers/media/platform/imx8/mxc-isi-core.c +++ b/drivers/media/platform/imx8/mxc-isi-core.c @@ -209,7 +209,8 @@ static int mxc_isi_pm_suspend(struct device *dev) { struct mxc_isi_dev *mxc_isi = dev_get_drvdata(dev); - if (mxc_isi->flags & MXC_ISI_PM_SUSPENDED) + if ((mxc_isi->flags & MXC_ISI_PM_SUSPENDED) || + (mxc_isi->flags & MXC_ISI_RUNTIME_SUSPEND)) return 0; clk_disable_unprepare(mxc_isi->clk); |