From patchwork Wed Sep 19 20:21:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 1480351 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 452F43FE79 for ; Wed, 19 Sep 2012 20:21:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751704Ab2ISUVk (ORCPT ); Wed, 19 Sep 2012 16:21:40 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:3069 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751696Ab2ISUVi (ORCPT ); Wed, 19 Sep 2012 16:21:38 -0400 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Wed, 19 Sep 2012 13:20:08 -0700 X-Server-Uuid: 4500596E-606A-40F9-852D-14843D8201B2 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Wed, 19 Sep 2012 13:20:55 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id EBF629FA05; Wed, 19 Sep 2012 13:21:26 -0700 (PDT) Received: from arend-vb-pepper (unknown [10.176.252.240]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 7E70E207DA; Wed, 19 Sep 2012 13:21:24 -0700 (PDT) Received: from arend by arend-vb-pepper with local (Exim 4.76) ( envelope-from ) id 1TEQlu-00050d-VA; Wed, 19 Sep 2012 22:21:22 +0200 From: "Arend van Spriel" To: "John W. Linville" cc: "Linux Wireless List" , "Piotr Haber" , "Arend van Spriel" Subject: [PATCH 10/13] brcmsmac: don't start device when RfKill is engaged Date: Wed, 19 Sep 2012 22:21:15 +0200 Message-ID: <1348086078-19183-11-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348086078-19183-1-git-send-email-arend@broadcom.com> References: <1348086078-19183-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 7C44F7723P84565026-05-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Piotr Haber This patch fixes a bug when device is being started while RfKill switch is engaged, leading to hang due to partial initialization of hardware. Tested-by: Reviewed-by: Arend van Spriel Reviewed-by: Hante Meuleman Signed-off-by: Piotr Haber Signed-off-by: Arend van Spriel --- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 718da8d..a744ea5 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -304,7 +304,10 @@ static int brcms_ops_start(struct ieee80211_hw *hw) wl->mute_tx = true; if (!wl->pub->up) - err = brcms_up(wl); + if (!blocked) + err = brcms_up(wl); + else + err = -ERFKILL; else err = -ENODEV; spin_unlock_bh(&wl->lock);