shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2c17810b099a0eae28cfc9f9c115431c1e9b0164'

Browse Source 
* commit '2c17810b099a0eae28cfc9f9c115431c1e9b0164':
  media: rockchip: vicap: fixes warning of clk disable when dev suspend

Change-Id: I3e431f1719b2c1dd96833fa9cbc86fa86a68b6f0
This commit is contained in:
Tao Huang
2023-10-31 18:41:28 +08:00
parent 294b431a58 2c17810b09
commit c10819c672
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/rockchip/cif/hw.c
View File

@@ -1554,6 +1554,9 @@ static int __maybe_unused rkcif_sleep_suspend(struct device *dev)
{
struct rkcif_hw *cif_hw = dev_get_drvdata(dev);
if (atomic_read(&cif_hw->power_cnt) == 0)
return 0;
rkcif_disable_sys_clk(cif_hw);
return pinctrl_pm_select_sleep_state(dev);
@@ -1564,6 +1567,9 @@ static int __maybe_unused rkcif_sleep_resume(struct device *dev)
struct rkcif_hw *cif_hw = dev_get_drvdata(dev);
int ret;
if (atomic_read(&cif_hw->power_cnt) == 0)
return 0;
ret = pinctrl_pm_select_default_state(dev);
if (ret < 0)
return ret;