From patchwork Mon Jul 6 07:39:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Kondratiev X-Patchwork-Id: 6720411 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 189B7C05AC for ; Mon, 6 Jul 2015 07:40:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4EBF0206E3 for ; Mon, 6 Jul 2015 07:40:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B4E12064C for ; Mon, 6 Jul 2015 07:40:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753883AbbGFHke (ORCPT ); Mon, 6 Jul 2015 03:40:34 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:4103 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753670AbbGFHka (ORCPT ); Mon, 6 Jul 2015 03:40:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1436168430; x=1467704430; h=from:cc:to:subject:date:message-id:in-reply-to: references; bh=43AKQGgTUmKLgnJYQyVRS9H3U/K/5bIKpjvcugEEWCM=; b=cPM84lGvglYP8mEiNoZFUtVlg67t8M4yUqXEppYPV9Dpb83jiBL5VlfF aPhhAk99Pv/bvGzJf4IYRQHOlMdWvR1/42ouQm8Fw7PTSzLlNGqnou5/b rjdKoR0nFBZJ+ZmFJ3nxCF6mG8bsS5Wxvf6q2vclYDul7RT1nXshT+9lU Q=; X-IronPort-AV: E=McAfee;i="5700,7163,7853"; a="126382237" Received: from ironmsg04-r.qualcomm.com ([172.30.46.18]) by wolverine01.qualcomm.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 06 Jul 2015 00:40:30 -0700 From: Vladimir Kondratiev Cc: Vladimir Kondratiev , linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com X-IronPort-AV: E=Sophos;i="5.15,413,1432623600"; d="scan'208";a="1007422892" Received: from lx-wigig-72.mea.qualcomm.com ([10.18.134.253]) by Ironmsg04-R.qualcomm.com with ESMTP; 06 Jul 2015 00:40:28 -0700 To: Kalle Valo Subject: [PATCH v2 10/13] wil6210: skip HW version check for chip debugging Date: Mon, 6 Jul 2015 10:39:46 +0300 Message-Id: <1436168389-3676-11-git-send-email-qca_vkondrat@qca.qualcomm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436168389-3676-1-git-send-email-qca_vkondrat@qca.qualcomm.com> References: <1436081080-27305-1-git-send-email-qca_vkondrat@qca.qualcomm.com> <1436168389-3676-1-git-send-email-qca_vkondrat@qca.qualcomm.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 When loading with debug_fw flag, do not bail out on unknown chipId Signed-off-by: Vladimir Kondratiev --- drivers/net/wireless/ath/wil6210/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c index cdc82cf..0d64e73 100644 --- a/drivers/net/wireless/ath/wil6210/main.c +++ b/drivers/net/wireless/ath/wil6210/main.c @@ -746,9 +746,6 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) wil_dbg_misc(wil, "%s()\n", __func__); - if (wil->hw_version == HW_VER_UNKNOWN) - return -ENODEV; - WARN_ON(!mutex_is_locked(&wil->mutex)); WARN_ON(test_bit(wil_status_napi_en, wil->status)); @@ -763,6 +760,9 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw) return 0; } + if (wil->hw_version == HW_VER_UNKNOWN) + return -ENODEV; + cancel_work_sync(&wil->disconnect_worker); wil6210_disconnect(wil, NULL, WLAN_REASON_DEAUTH_LEAVING, false); wil_bcast_fini(wil);