aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibo Chen <haibo.chen@nxp.com>2022-12-13 17:43:51 +0800
committerMarc Kleine-Budde <mkl@pengutronix.de>2022-12-19 16:08:27 +0100
commit3bc2afcba81275306adfbfca83f38a52858c5940 (patch)
tree0156d9c7d6b3ae8c7c88c760cab04218b063353c
parent115dd5469019296040359060743de77071ccb6ec (diff)
downloadpci-3bc2afcba81275306adfbfca83f38a52858c5940.tar.gz
can: flexcan: avoid unbalanced pm_runtime_enable warning
When do suspend/resume, meet the following warning message: [ 30.028336] flexcan 425b0000.can: Unbalanced pm_runtime_enable! Balance the pm_runtime_force_suspend() and pm_runtime_force_resume(). Fixes: 8cb53b485f18 ("can: flexcan: add auto stop mode for IMX93 to support wakeup") Signed-off-by: Haibo Chen <haibo.chen@nxp.com> Link: https://lore.kernel.org/all/20221213094351.3023858-1-haibo.chen@nxp.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rw-r--r--drivers/net/can/flexcan/flexcan-core.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
index 0aeff34e5ae17c..6d638c93977bc7 100644
--- a/drivers/net/can/flexcan/flexcan-core.c
+++ b/drivers/net/can/flexcan/flexcan-core.c
@@ -2349,9 +2349,15 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device)
if (netif_running(dev)) {
int err;
- err = pm_runtime_force_resume(device);
- if (err)
- return err;
+ /* For the wakeup in auto stop mode, no need to gate on the
+ * clock here, hardware will do this automatically.
+ */
+ if (!(device_may_wakeup(device) &&
+ priv->devtype_data.quirks & FLEXCAN_QUIRK_AUTO_STOP_MODE)) {
+ err = pm_runtime_force_resume(device);
+ if (err)
+ return err;
+ }
if (device_may_wakeup(device))
flexcan_enable_wakeup_irq(priv, false);