mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
bb34e69f3d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 80ee9108bee3d22e90191a67036133de09faf7cc Mon Sep 17 00:00:00 2001
|
|
From: Simon Graham <simon.graham@virtualcomputer.com>
|
|
Date: Tue, 7 Feb 2012 18:07:38 -0600
|
|
Subject: [PATCH 037/147] rtlwifi: Handle previous allocation failures when
|
|
freeing device memory
|
|
|
|
commit 7f66c2f93e5779625c10d262c84537427a2673ca upstream.
|
|
|
|
Handle previous allocation failures when freeing device memory
|
|
|
|
Signed-off-by: Simon Graham <simon.graham@virtualcomputer.com>
|
|
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/net/wireless/rtlwifi/pci.c | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
|
|
index 19bb550..9afcad3 100644
|
|
--- a/drivers/net/wireless/rtlwifi/pci.c
|
|
+++ b/drivers/net/wireless/rtlwifi/pci.c
|
|
@@ -1155,10 +1155,12 @@ static void _rtl_pci_free_tx_ring(struct ieee80211_hw *hw,
|
|
ring->idx = (ring->idx + 1) % ring->entries;
|
|
}
|
|
|
|
- pci_free_consistent(rtlpci->pdev,
|
|
- sizeof(*ring->desc) * ring->entries,
|
|
- ring->desc, ring->dma);
|
|
- ring->desc = NULL;
|
|
+ if (ring->desc) {
|
|
+ pci_free_consistent(rtlpci->pdev,
|
|
+ sizeof(*ring->desc) * ring->entries,
|
|
+ ring->desc, ring->dma);
|
|
+ ring->desc = NULL;
|
|
+ }
|
|
}
|
|
|
|
static void _rtl_pci_free_rx_ring(struct rtl_pci *rtlpci)
|
|
@@ -1182,12 +1184,14 @@ static void _rtl_pci_free_rx_ring(struct rtl_pci *rtlpci)
|
|
kfree_skb(skb);
|
|
}
|
|
|
|
- pci_free_consistent(rtlpci->pdev,
|
|
+ if (rtlpci->rx_ring[rx_queue_idx].desc) {
|
|
+ pci_free_consistent(rtlpci->pdev,
|
|
sizeof(*rtlpci->rx_ring[rx_queue_idx].
|
|
desc) * rtlpci->rxringcount,
|
|
rtlpci->rx_ring[rx_queue_idx].desc,
|
|
rtlpci->rx_ring[rx_queue_idx].dma);
|
|
- rtlpci->rx_ring[rx_queue_idx].desc = NULL;
|
|
+ rtlpci->rx_ring[rx_queue_idx].desc = NULL;
|
|
+ }
|
|
}
|
|
}
|
|
|
|
--
|
|
1.7.9.4
|
|
|