From patchwork Thu Oct 23 16:27:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 5142081 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3772C11AC for ; Thu, 23 Oct 2014 16:27:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE5B920154 for ; Thu, 23 Oct 2014 16:27:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 727242011D for ; Thu, 23 Oct 2014 16:27:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753869AbaJWQ1a (ORCPT ); Thu, 23 Oct 2014 12:27:30 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:39295 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751102AbaJWQ12 (ORCPT ); Thu, 23 Oct 2014 12:27:28 -0400 Received: by mail-pa0-f49.google.com with SMTP id hz1so1346943pad.22 for ; Thu, 23 Oct 2014 09:27:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=CayZqq+Wg3oldJCfP71czxoEZA448KLzXPJjtXAvMHg=; b=lVA5hsvdhuDN+qv6xdgtlVUZqqSWtLe9YCqjvW8etTGhLYHA+Jld4ExhnsjSMo10nY H1somGIZc8EUBNe/vdQ+5NLjhV/D08TPIqIet6PQwVArJVoUqhv7ubx4O/lcnuPlRrkq MIkiqLYfAto/Dpka8wk+dzjRz2XTYwMYBUxsoArKMM9pyc2Wcbm+uNx5IILeQviKcCFg nsU5YcNPGcdPFtMpkNVEvO8P6IgenaEjPvqdlcor92MEIMh+igDctxNKWuXEr19cpzoR A8Ia3KH2MEh3le4iaX8JJvYtUySSMxT1DCsBWr/orI/h8PC1jkGeahRDR2HkUKoQQY1u cGIw== X-Received: by 10.70.56.103 with SMTP id z7mr2718859pdp.164.1414081648180; Thu, 23 Oct 2014 09:27:28 -0700 (PDT) Received: from linux.site (c-24-16-50-76.hsd1.wa.comcast.net. [24.16.50.76]) by mx.google.com with ESMTPSA id h6sm1902025pdk.38.2014.10.23.09.27.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Oct 2014 09:27:27 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, troy_tan@realsil.com.cn, Larry Finger , netdev@vger.kernel.org, Murilo Opsfelder Araujo , Mike Galbraith , Thadeu Cascardo Subject: [PATCH V3.18] rtlwifi: Add check for get_btc_status callback Date: Thu, 23 Oct 2014 11:27:09 -0500 Message-Id: <1414081629-23002-1-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.8.4.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drivers that do not use the get_btc_status() callback may not define a dummy routine. The caller needs to check before making the call. Signed-off-by: Larry Finger Cc: Murilo Opsfelder Araujo Cc: Mike Galbraith Cc: Thadeu Cascardo --- John, This missing statement is causing kernel crashes for several of the drivers. This patch should be applied ASAP. Larry --- drivers/net/wireless/rtlwifi/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index 667aba8..25daa87 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -1796,7 +1796,8 @@ static int rtl_pci_start(struct ieee80211_hw *hw) rtl_pci_reset_trx_ring(hw); rtlpci->driver_is_goingto_unload = false; - if (rtlpriv->cfg->ops->get_btc_status()) { + if (rtlpriv->cfg->ops->get_btc_status && + rtlpriv->cfg->ops->get_btc_status()) { rtlpriv->btcoexist.btc_ops->btc_init_variables(rtlpriv); rtlpriv->btcoexist.btc_ops->btc_init_hal_vars(rtlpriv); }