evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ipa3: Fix Q6 resourse manager de-init"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-03 20:51:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit c430aad6dc
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/platform/msm/ipa/ipa_v2/rmnet_ipa.c
View file

@ -1878,7 +1878,9 @@ void q6_deinitialize_rm(void)
if (ret < 0) if (ret < 0)
IPAWANERR("Error deleting resource %d, ret=%d\n", IPAWANERR("Error deleting resource %d, ret=%d\n",
IPA_RM_RESOURCE_Q6_PROD, ret); IPA_RM_RESOURCE_Q6_PROD, ret);
destroy_workqueue(ipa_rm_q6_workqueue);
if (ipa_rm_q6_workqueue)
destroy_workqueue(ipa_rm_q6_workqueue);
} }
static void wake_tx_queue(struct work_struct *work) static void wake_tx_queue(struct work_struct *work)
@ -2187,7 +2189,10 @@ timer_init_err:
IPAWANERR("Error deleting resource %d, ret=%d\n", IPAWANERR("Error deleting resource %d, ret=%d\n",
IPA_RM_RESOURCE_WWAN_0_PROD, ret); IPA_RM_RESOURCE_WWAN_0_PROD, ret);
create_rsrc_err: create_rsrc_err:
q6_deinitialize_rm();
if (!atomic_read(&is_ssr))
q6_deinitialize_rm();
q6_init_err: q6_init_err:
free_netdev(ipa_netdevs[0]); free_netdev(ipa_netdevs[0]);
ipa_netdevs[0] = NULL; ipa_netdevs[0] = NULL;

9
drivers/platform/msm/ipa/ipa_v3/rmnet_ipa.c
View file

@ -1952,7 +1952,9 @@ void ipa3_q6_deinitialize_rm(void)
if (ret < 0) if (ret < 0)
IPAWANERR("Error deleting resource %d, ret=%d\n", IPAWANERR("Error deleting resource %d, ret=%d\n",
IPA_RM_RESOURCE_Q6_PROD, ret); IPA_RM_RESOURCE_Q6_PROD, ret);
destroy_workqueue(rmnet_ipa3_ctx->rm_q6_wq);
if (rmnet_ipa3_ctx->rm_q6_wq)
destroy_workqueue(rmnet_ipa3_ctx->rm_q6_wq);
} }
static void ipa3_wake_tx_queue(struct work_struct *work) static void ipa3_wake_tx_queue(struct work_struct *work)
@ -2292,7 +2294,10 @@ timer_init_err:
IPAWANERR("Error deleting resource %d, ret=%d\n", IPAWANERR("Error deleting resource %d, ret=%d\n",
IPA_RM_RESOURCE_WWAN_0_PROD, ret); IPA_RM_RESOURCE_WWAN_0_PROD, ret);
create_rsrc_err: create_rsrc_err:
ipa3_q6_deinitialize_rm();
if (!atomic_read(&rmnet_ipa3_ctx->is_ssr))
ipa3_q6_deinitialize_rm();
q6_init_err: q6_init_err:
free_netdev(dev); free_netdev(dev);
rmnet_ipa3_ctx->wwan_priv = NULL; rmnet_ipa3_ctx->wwan_priv = NULL;