Merge "ath10k: Disconnect QMI client in case of load failure" (d304dfa6) · Commits · e / devices / android_kernel_sony_msm8998

drivers/net/wireless/ath/ath10k/snoc.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1274,19 +1274,19 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
		ret = ath10k_snoc_claim(ar);
		if (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);
		if (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);
		if (ret) {
		ath10k_err(ar, "failed to allocate copy engine pipes: %d\n",
		ret);
		goto err_core_destroy;
		goto err_stop_qmi_service;
		}

		netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll,
		@@ -1319,6 +1319,9 @@ err_free_irq:
		err_free_pipes:
		ath10k_snoc_free_pipes(ar);

		err_stop_qmi_service:
		ath10k_snoc_stop_qmi_service(ar);

		err_core_destroy:
		ath10k_core_destroy(ar);