From patchwork Wed Dec 26 22:08:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 208224 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6D0FF2C0079 for ; Thu, 27 Dec 2012 09:09:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264Ab2LZWJd (ORCPT ); Wed, 26 Dec 2012 17:09:33 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:45569 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193Ab2LZWIy (ORCPT ); Wed, 26 Dec 2012 17:08:54 -0500 Received: by mail-pb0-f46.google.com with SMTP id wy7so4969565pbc.19 for ; Wed, 26 Dec 2012 14:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=QL7EgMjuBPMSoeKPuCMxHWTU/H1l9jYqfyzaWV4Qtqs=; b=Z8Y6BfQyAlqfEV2zA3zjEo/ktlPO+F2g2s1a5JMw75VhY5eniJc/pL/8DyITEq7UQ9 K1Hnj9Hc6M7XKBcp/KxGVRxy0ZKYJ8YWNMVvoVqUNjXoEK43uiis+EIyhw1rrpdAX41k dl4hM1gvbHKxOVJQoRQjvmbpFbrBkr0ZRYmSNGHxcVN/chd6VszOjlncr0iwXIyNpPeR oqbev0hWVcibzAsJhMXW/BsrjwSSXbVJ2+deOW7RvS6K5vKdtUGco4hoScjWWr8YDbyo +FdBkOqNUVJVeyIv5PBZleL7YGlxbdZJb+lep2be/RUBdth1glerMcAzcOVNpsnY532p +FIQ== X-Received: by 10.68.190.41 with SMTP id gn9mr88639192pbc.7.1356559733931; Wed, 26 Dec 2012 14:08:53 -0800 (PST) Received: from larrylap.site (CPE-75-81-36-228.kc.res.rr.com. [75.81.36.228]) by mx.google.com with ESMTPS id ty4sm16526581pbc.57.2012.12.26.14.08.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Dec 2012 14:08:53 -0800 (PST) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org Subject: [PATCH V3.8 4/5] rtlwifi: rtl8192se: Fix warning for unchecked pci_map_single() call Date: Wed, 26 Dec 2012 16:08:10 -0600 Message-Id: <1356559691-5048-5-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356559691-5048-1-git-send-email-Larry.Finger@lwfinger.net> References: <1356559691-5048-1-git-send-email-Larry.Finger@lwfinger.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c index 0e9f6eb..206561d 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c @@ -611,6 +611,11 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, PCI_DMA_TODEVICE); u8 bw_40 = 0; + if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, + "DMA mapping error"); + return; + } if (mac->opmode == NL80211_IFTYPE_STATION) { bw_40 = mac->bw_40; } else if (mac->opmode == NL80211_IFTYPE_AP || @@ -763,6 +768,7 @@ void rtl92se_tx_fill_desc(struct ieee80211_hw *hw, void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, bool firstseg, bool lastseg, struct sk_buff *skb) { + struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); struct rtl_tcb_desc *tcb_desc = (struct rtl_tcb_desc *)(skb->cb); @@ -770,7 +776,12 @@ void rtl92se_tx_fill_cmddesc(struct ieee80211_hw *hw, u8 *pdesc, dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); - /* Clear all status */ + if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, + "DMA mapping error"); + return; + } + /* Clear all status */ CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_CMDDESC_SIZE_RTL8192S); /* This bit indicate this packet is used for FW download. */