rtlwifi: Handle previous allocation failures when freeing device memory

BugLink: http://bugs.launchpad.net/bugs/971808

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>

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index c872a232427..6c56198e26b 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1180,10 +1180,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)
@@ -1207,12 +1209,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;
+                }
         }
 }