Skip to content

Commit 331dcf4

Browse files
sudeep-hollaWolfram Sang
authored and
Wolfram Sang
committed
i2c: qup: skip qup_i2c_suspend if the device is already runtime suspended
If the i2c device is already runtime suspended, if qup_i2c_suspend is executed during suspend-to-idle or suspend-to-ram it will result in the following splat: WARNING: CPU: 3 PID: 1593 at drivers/clk/clk.c:476 clk_core_unprepare+0x80/0x90 Modules linked in: CPU: 3 PID: 1593 Comm: bash Tainted: G W 4.8.0-rc3 #14 Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT) PC is at clk_core_unprepare+0x80/0x90 LR is at clk_unprepare+0x28/0x40 pc : [<ffff0000086eecf0>] lr : [<ffff0000086f0c58>] pstate: 60000145 Call trace: clk_core_unprepare+0x80/0x90 qup_i2c_disable_clocks+0x2c/0x68 qup_i2c_suspend+0x10/0x20 platform_pm_suspend+0x24/0x68 ... This patch fixes the issue by executing qup_i2c_pm_suspend_runtime conditionally in qup_i2c_suspend. Signed-off-by: Sudeep Holla <[email protected]> Reviewed-by: Andy Gross <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Cc: [email protected]
1 parent 463e8f8 commit 331dcf4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/i2c/busses/i2c-qup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,8 @@ static int qup_i2c_pm_resume_runtime(struct device *device)
15991599
#ifdef CONFIG_PM_SLEEP
16001600
static int qup_i2c_suspend(struct device *device)
16011601
{
1602-
qup_i2c_pm_suspend_runtime(device);
1602+
if (!pm_runtime_suspended(device))
1603+
return qup_i2c_pm_suspend_runtime(device);
16031604
return 0;
16041605
}
16051606

0 commit comments

Comments
 (0)