From patchwork Wed Dec 26 22:08:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 208220 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 6C88A2C00B0 for ; Thu, 27 Dec 2012 09:08:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751182Ab2LZWIu (ORCPT ); Wed, 26 Dec 2012 17:08:50 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:42261 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142Ab2LZWIs (ORCPT ); Wed, 26 Dec 2012 17:08:48 -0500 Received: by mail-pa0-f41.google.com with SMTP id bj3so5146012pad.28 for ; Wed, 26 Dec 2012 14:08:48 -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=ZRX24ApYM43bbBewGqE+xnAD6UPa/2L3hkfd7p2jfcY=; b=uhR6/rwO/VsxowcxAsLNRqPXY2xv7zZdxAzU7ldQSs+is1JbJ16IQtkjma8jks0p2E vcQw0YczYkyYHfkAfdu3V7oyKq+6Au0niJAXKfit9BcnaujA26dr+l4qDhU8xX3u43rq rJ8GoGeXSI9OuS1tSZjmo4zoSVV1ZYOMkV/edNJc1aWqMMu4LjbY+7TXeJ3XfBLPDTXZ n1tvLEHIIIOknMEGSYCz711N7H5HaZN57isvzy/F53e/DUpbWFlHROxuTZBAAQk0xDoH LwUVWDzbgmYv1rZ2JkjsAo62CYCjtv24A+KrPjNHm5fqG9ViqMDP8JSSJ2CoXDnUAEHe Zjiw== X-Received: by 10.68.209.230 with SMTP id mp6mr88677414pbc.8.1356559728368; Wed, 26 Dec 2012 14:08:48 -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.46 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Dec 2012 14:08:47 -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 1/5] rtlwifi: Fix warning for unchecked pci_map_single() call Date: Wed, 26 Dec 2012 16:08:07 -0600 Message-Id: <1356559691-5048-2-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/pci.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 3deacaf..4261e8e 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -743,6 +743,8 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) done: bufferaddress = (*((dma_addr_t *)skb->cb)); + if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress)) + return; tmp_one = 1; rtlpriv->cfg->ops->set_desc((u8 *) pdesc, false, HW_DESC_RXBUFF_ADDR, @@ -1115,6 +1117,10 @@ static int _rtl_pci_init_rx_ring(struct ieee80211_hw *hw) PCI_DMA_FROMDEVICE); bufferaddress = (*((dma_addr_t *)skb->cb)); + if (pci_dma_mapping_error(rtlpci->pdev, bufferaddress)) { + dev_kfree_skb_any(skb); + return 1; + } rtlpriv->cfg->ops->set_desc((u8 *)entry, false, HW_DESC_RXBUFF_ADDR, (u8 *)&bufferaddress);