]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ath11k: fix error return code in ath11k_dp_alloc()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 27 Apr 2020 10:46:21 +0000 (10:46 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Jun 2020 07:32:38 +0000 (09:32 +0200)
[ Upstream commit f76f750aeea47fd98b6502eb6d37f84ca33662bf ]

Fix to return negative error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: d0998eb84ed3 ("ath11k: optimise ath11k_dp_tx_completion_handler")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200427104621.23752-1-weiyongjun1@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ath/ath11k/dp.c

index 50350f77b309789661fcb9f2fa46b220629b1c52..2f35d325f7a571b55d15e886ddf83648d37e69f8 100644 (file)
@@ -909,8 +909,10 @@ int ath11k_dp_alloc(struct ath11k_base *ab)
                dp->tx_ring[i].tx_status_head = 0;
                dp->tx_ring[i].tx_status_tail = DP_TX_COMP_RING_SIZE - 1;
                dp->tx_ring[i].tx_status = kmalloc(size, GFP_KERNEL);
-               if (!dp->tx_ring[i].tx_status)
+               if (!dp->tx_ring[i].tx_status) {
+                       ret = -ENOMEM;
                        goto fail_cmn_srng_cleanup;
+               }
        }
 
        for (i = 0; i < HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++)