diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2012-12-27 11:37:29 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-01-02 14:38:32 -0500 |
commit | 9145910161ebe227fcdacbc771fadfa55a364763 (patch) | |
tree | 42d87477c70056d1c33851b12bfd366230e254d0 | |
parent | 86bfec8d5183be4601db3cc4ffab58fceec33838 (diff) |
rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call
Kernel 3.8 implements checking of all DMA mapping calls and issues
a WARNING for the first it finds that is not checked.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 173424756149..c31795e379f7 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | |||
@@ -611,8 +611,14 @@ void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, | |||
611 | dma_addr_t mapping = pci_map_single(rtlpci->pdev, | 611 | dma_addr_t mapping = pci_map_single(rtlpci->pdev, |
612 | skb->data, skb->len, | 612 | skb->data, skb->len, |
613 | PCI_DMA_TODEVICE); | 613 | PCI_DMA_TODEVICE); |
614 | |||
614 | u8 bw_40 = 0; | 615 | u8 bw_40 = 0; |
615 | 616 | ||
617 | if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { | ||
618 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, | ||
619 | "DMA mapping error"); | ||
620 | return; | ||
621 | } | ||
616 | rcu_read_lock(); | 622 | rcu_read_lock(); |
617 | sta = get_sta(hw, mac->vif, mac->bssid); | 623 | sta = get_sta(hw, mac->vif, mac->bssid); |
618 | if (mac->opmode == NL80211_IFTYPE_STATION) { | 624 | if (mac->opmode == NL80211_IFTYPE_STATION) { |
@@ -774,6 +780,11 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, | |||
774 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data); | 780 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data); |
775 | __le16 fc = hdr->frame_control; | 781 | __le16 fc = hdr->frame_control; |
776 | 782 | ||
783 | if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { | ||
784 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, | ||
785 | "DMA mapping error"); | ||
786 | return; | ||
787 | } | ||
777 | CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); | 788 | CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); |
778 | 789 | ||
779 | if (firstseg) | 790 | if (firstseg) |