From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EC71C3B189 for ; Thu, 13 Feb 2020 16:01:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27C122073C for ; Thu, 13 Feb 2020 16:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581609709; bh=eb1UltVrFvwiuZunsalF4EFcmZxE9toebsgbA/VaFy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ALhwfDSWhlFNRvJP2cH21PPqsUkz+wtE/pmTGceQz/6ZmogqyY2NNVSdA48ZBw1LN AzNa3U8lZWYHEwoj+Y+bGZty7QP69973PY0hP6e6trrGMvffs5BD5PSxFTkdswqsoe ZL6HftSOyavih0Ogjv5+83Qk80ctCUenSqeyOurU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730254AbgBMQBp (ORCPT ); Thu, 13 Feb 2020 11:01:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:38542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727864AbgBMPYi (ORCPT ); Thu, 13 Feb 2020 10:24:38 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9D453246B8; Thu, 13 Feb 2020 15:24:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607473; bh=eb1UltVrFvwiuZunsalF4EFcmZxE9toebsgbA/VaFy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uznEuYOEI902yu8BHHLF+uS5sIN0Fj6Z81uOkq2A8Zr90FhYesDQ3CZVVSVNxnCqc mbog5r9rqDg1koYDQVMTUdUfuEnq7jxljbFfG6DpdbLUesRZUe/uN7F++rvTUpBOjK DGMkxGLF5iD29WcdSpumn+xSGQsxTYfkDZxQoMDo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Sperling , Luca Coelho , Sasha Levin Subject: [PATCH 4.14 004/173] iwlwifi: mvm: fix NVM check for 3168 devices Date: Thu, 13 Feb 2020 07:18:27 -0800 Message-Id: <20200213151933.253082365@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151931.677980430@linuxfoundation.org> References: <20200213151931.677980430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luca Coelho [ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ] We had a check on !NVM_EXT and then a check for NVM_SDP in the else block of this if. The else block, obviously, could only be reached if using NVM_EXT, so it would never be NVM_SDP. Fix that by checking whether the nvm_type is IWL_NVM instead of checking for !IWL_NVM_EXT to solve this issue. Reported-by: Stefan Sperling Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index ca2d66ce84247..8f3032b7174d3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -298,7 +298,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm) int regulatory_type; /* Checking for required sections */ - if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) { + if (mvm->trans->cfg->nvm_type == IWL_NVM) { if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data || !mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) { IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n"); -- 2.20.1