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

Merge "ath10k: Disconnect QMI client in case of load failure"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-07 04:11:19 -07:00 • committed by Gerrit - the friendly Code Review server
commit d304dfa6f9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/ath/ath10k/snoc.c
View file

@ -1274,19 +1274,19 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
ret = ath10k_snoc_claim(ar); ret = ath10k_snoc_claim(ar);
if (ret) { if (ret) {
ath10k_err(ar, "failed to claim device: %d\n", ret); ath10k_err(ar, "failed to claim device: %d\n", ret);
goto err_core_destroy; goto err_stop_qmi_service;
} }
ret = ath10k_snoc_bus_configure(ar); ret = ath10k_snoc_bus_configure(ar);
if (ret) { if (ret) {
ath10k_err(ar, "failed to configure bus: %d\n", ret); ath10k_err(ar, "failed to configure bus: %d\n", ret);
goto err_core_destroy; goto err_stop_qmi_service;
} }
ret = ath10k_snoc_alloc_pipes(ar); ret = ath10k_snoc_alloc_pipes(ar);
if (ret) { if (ret) {
ath10k_err(ar, "failed to allocate copy engine pipes: %d\n", ath10k_err(ar, "failed to allocate copy engine pipes: %d\n",
ret); ret);
goto err_core_destroy; goto err_stop_qmi_service;
} }
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll, netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll,
@ -1319,6 +1319,9 @@ err_free_irq:
err_free_pipes: err_free_pipes:
ath10k_snoc_free_pipes(ar); ath10k_snoc_free_pipes(ar);
err_stop_qmi_service:
ath10k_snoc_stop_qmi_service(ar);
err_core_destroy: err_core_destroy:
ath10k_core_destroy(ar); ath10k_core_destroy(ar);