From c0e7f285a03803fb6ee805ce6a35d99a6533747d Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Mon, 18 Apr 2022 17:53:27 +0530 Subject: [PATCH] icnss2: Add change to enable icnss2 driver unloading Rproc_put should gets called only after rproc subsys shutdown as it decreases refcount. Rproc_put should not be called from icnss_remove as refcount should not be decreased without incrementing it using rproc get_by_phandle api. Change-Id: I26dc83d9750e45726e9e59d33a75d4ff402caa62 Signed-off-by: Sandeep Singh --- icnss2/main.c | 1 - icnss2/qmi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/icnss2/main.c b/icnss2/main.c index 6bddab09eb..03866dc5b8 100644 --- a/icnss2/main.c +++ b/icnss2/main.c @@ -4334,7 +4334,6 @@ static int icnss_remove(struct platform_device *pdev) mbox_free_channel(priv->mbox_chan); unregister_trace_android_vh_rproc_recovery_set(rproc_restart_level_notifier, NULL); complete_all(&priv->smp2p_soc_wake_wait); - rproc_put(priv->rproc); icnss_destroy_ramdump_device(priv->m3_dump_phyareg); icnss_destroy_ramdump_device(priv->m3_dump_phydbg); icnss_destroy_ramdump_device(priv->m3_dump_wmac0reg); diff --git a/icnss2/qmi.c b/icnss2/qmi.c index 984573abe4..478c03f6ce 100644 --- a/icnss2/qmi.c +++ b/icnss2/qmi.c @@ -2927,7 +2927,7 @@ static void wlfw_del_server(struct qmi_handle *qmi, struct icnss_priv *priv = container_of(qmi, struct icnss_priv, qmi); if (priv && test_bit(ICNSS_DEL_SERVER, &priv->state)) { - icnss_pr_info("WLFW server delete in progress, Ignore server delete: 0x%lx\n", + icnss_pr_info("WLFW server delete / icnss remove in progress, Ignore server delete: 0x%lx\n", priv->state); return; }