From dd00ce5aa39fdc7233b195f15537da3d1ef091c1 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Fri, 4 Dec 2020 16:56:36 -0800 Subject: [PATCH] cnss2: Fix an issue when MSM SSR feature is not enabled Commit cd7f41586760 ("cnss2: Wait for power up complete during SSR restart") breaks the compilation when MSM SSR feature is not enabled. Fix it properly in this change. Change-Id: I9e16174a4063b037d50f890eccb0983bd68a54a8 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index a00eff76e3cc..4d3ea24a3fda 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -1044,6 +1044,8 @@ static void cnss_recovery_work_handler(struct work_struct *work) #else static void cnss_recovery_work_handler(struct work_struct *work) { + int ret; + struct cnss_plat_data *plat_priv = container_of(work, struct cnss_plat_data, recovery_work); @@ -1057,6 +1059,7 @@ static void cnss_recovery_work_handler(struct work_struct *work) ret = cnss_bus_dev_powerup(plat_priv); if (ret) __pm_relax(plat_priv->recovery_ws); + return; }