From 0f29dec405472bd5266ee3e8be00fad946da30fd Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 6 Jul 2021 14:27:21 +0800 Subject: [PATCH] Revert "ath11k: fixes a memory leak as the MHI controller was allocated but never freed" (#7286) This makes memory leak more seriously. This reverts commit 48a880a19079af7e4f071820e447514d6079d381. Signed-off-by: Tianling Shen --- ...-to-allocate-and-free-MHI-controller.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/kernel/mac80211/patches/ath11k/200-ath11k-use-MHI-provided-APIs-to-allocate-and-free-MHI-controller.patch diff --git a/package/kernel/mac80211/patches/ath11k/200-ath11k-use-MHI-provided-APIs-to-allocate-and-free-MHI-controller.patch b/package/kernel/mac80211/patches/ath11k/200-ath11k-use-MHI-provided-APIs-to-allocate-and-free-MHI-controller.patch deleted file mode 100644 index dc3d2ccd9..000000000 --- a/package/kernel/mac80211/patches/ath11k/200-ath11k-use-MHI-provided-APIs-to-allocate-and-free-MHI-controller.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c -index aded9a7..1c9d9dc 100644 ---- a/drivers/net/wireless/ath/ath11k/mhi.c -+++ b/drivers/net/wireless/ath/ath11k/mhi.c -@@ -218,7 +218,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci) - struct mhi_controller *mhi_ctrl; - int ret; - -- mhi_ctrl = kzalloc(sizeof(*mhi_ctrl), GFP_KERNEL); -+ mhi_ctrl = mhi_alloc_controller(); - if (!mhi_ctrl) - return -ENOMEM; - -@@ -234,7 +234,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci) - ret = ath11k_mhi_get_msi(ab_pci); - if (ret) { - ath11k_err(ab, "failed to get msi for mhi\n"); -- kfree(mhi_ctrl); -+ mhi_free_controller(mhi_ctrl); - return ret; - } - -@@ -252,7 +252,7 @@ int ath11k_mhi_register(struct ath11k_pci *ab_pci) - ret = mhi_register_controller(mhi_ctrl, &ath11k_mhi_config); - if (ret) { - ath11k_err(ab, "failed to register to mhi bus, err = %d\n", ret); -- kfree(mhi_ctrl); -+ mhi_free_controller(mhi_ctrl); - return ret; - } - -@@ -265,6 +265,7 @@ void ath11k_mhi_unregister(struct ath11k_pci *ab_pci) - - mhi_unregister_controller(mhi_ctrl); - kfree(mhi_ctrl->irq); -+ mhi_free_controller(mhi_ctrl); - } - - static char *ath11k_mhi_state_to_str(enum ath11k_mhi_state mhi_state)