From patchwork Thu Dec 27 16:37:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 208347 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 C3C382C00D7 for ; Fri, 28 Dec 2012 03:43:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201Ab2L0Qm6 (ORCPT ); Thu, 27 Dec 2012 11:42:58 -0500 Received: from mail-pb0-f53.google.com ([209.85.160.53]:45191 "EHLO mail-pb0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079Ab2L0Qm4 (ORCPT ); Thu, 27 Dec 2012 11:42:56 -0500 Received: by mail-pb0-f53.google.com with SMTP id jt11so5432783pbb.12 for ; Thu, 27 Dec 2012 08:42:56 -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=3DObGR3GqG9NH0hGYdNlnL9PMuTkzwzvpBxTAuOtBpk=; b=ZF/k2q1mUCl78NjZopUB8w1kmarkS8HBKZCybOMEG/iehD6WqaU+vf3nRYYotRxla9 4Bsch4F6bPex/cZ3B0/sxg6+my/FjHqMm+VuBUabYsYSMwrDsFw17bdinMmgggIaKo3Z 2fUm9FP7iNqFakZKPP5iVPFrYNzgzLcAIxUCd3Jhv30YlW8s1hlm0TcYDTUWbs6/d+D1 AR+Bb5Pshbko595vQTo0u0N6pxvx7MvkS0g96ZBXF0hRXBe88Xf5bOa2yLmF4SliOeIC T/PN5Fqty3gq5npvo3c8Z+t6ixnvOZdUSWICboH+BPPMuvYfmZYaCsHv4T/Fr3uJ7444 nlXQ== X-Received: by 10.66.77.200 with SMTP id u8mr91170841paw.43.1356626270021; Thu, 27 Dec 2012 08:37:50 -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 x6sm18706992pav.29.2012.12.27.08.37.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Dec 2012 08:37:49 -0800 (PST) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org Subject: [PATCH 3.8 2/5 V2] rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call Date: Thu, 27 Dec 2012 10:37:29 -0600 Message-Id: <1356626252-4058-3-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1356626252-4058-1-git-send-email-Larry.Finger@lwfinger.net> References: <1356626252-4058-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/rtl8192ce/trx.c | 11 +++++++++++ 1 file changed, 11 insertions(+) No change for V2. diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 1734247..c31795e 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, dma_addr_t mapping = pci_map_single(rtlpci->pdev, skb->data, skb->len, 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; + } rcu_read_lock(); sta = get_sta(hw, mac->vif, mac->bssid); if (mac->opmode == NL80211_IFTYPE_STATION) { @@ -774,6 +780,11 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data); __le16 fc = hdr->frame_control; + if (pci_dma_mapping_error(rtlpci->pdev, mapping)) { + RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, + "DMA mapping error"); + return; + } CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE); if (firstseg)