Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp11228683ybl; Fri, 27 Dec 2019 09:56:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyl4h8ILZnha4xxgpYgtr0ErkCGs5AFzzMux9VqEPSJcL5sFHZZyI9sp2ORWSWRdeT1Weis X-Received: by 2002:a9d:6f07:: with SMTP id n7mr56253029otq.112.1577469386697; Fri, 27 Dec 2019 09:56:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577469386; cv=none; d=google.com; s=arc-20160816; b=wInAbsCc0sxU3GiOj6P2JNY1HupZJsg4/JfJb6oWUOIUuKgUciyMRVImJg5AHJU8yQ lH1giRwZprlJzTs57IQhHcHWVFE/MpB70RXejP0k6zZSLVZZwuYwBnm3Fa60jcBDrWHv immTxG9tn6MLwSrmbeeBuPUW9459R7A3QlTZlRmO2UrIEiTh46/3kRH/Slp4BfzUh4vJ ESdMmflIw0wnM4Stv8pJvjJdcbW1ZTBI6ql+V98nfCIzd6IHRxtM79YzgoGzeM8YMOgu y09uWSiEaMjH3NUqLv2XQhkTLFMDz9YdiAze66dPH5Qe3nO8Octz7wVGELoz9hU/0Qn9 +mcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vJxcVQ5wyc5lG0sjOXsSrdX3QPoFE4rD6CJ3Zs5GwBA=; b=0y4uidAr8iKHx95HjYUpxHF49ExBIDDF3pSedYNd0qWONd8PdowbIpSJCPb2mDQ+eN XkdxjBjZzuYa5aRUsk8Jr2NB+8oOtMTmLcjgohcgkIw3h10wK57aK/0KjTnVsEIZUS9H ZvKjLyQEkBW0BIdtfjlgHSHApPVz50iyl9j9uw9cZMmITnIjclrSCd/wMF1qcJqnzaQm ND1BPgchgbZW4wL3Ben2Q7C6so/x7iLiLjclmsnuT2t1D5MfhpQw5ypf3zRBzH4yq+3K n4M15n2a82f7TO5hgtJZZ/ZNdVGbWU34mnRQV/yQvdRbr5z/K9wfHDA++qDwOssxtuLN 1peg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HprOG/Ih"; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p3si17419311oih.186.2019.12.27.09.56.16; Fri, 27 Dec 2019 09:56:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="HprOG/Ih"; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727734AbfL0RmH (ORCPT + 99 others); Fri, 27 Dec 2019 12:42:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:38734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727126AbfL0RmF (ORCPT ); Fri, 27 Dec 2019 12:42:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6199420CC7; Fri, 27 Dec 2019 17:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577468525; bh=S2mj7vV8Qc/c49pbhgd4tw4+L6FzjsTck13YfwNPXjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HprOG/IhDBp5wyFR+A5d9NaDq1p75jf1GcWPgzL9LInOeq0hQDyionW/NgJY6qpAa X/1+d+kzKslY52L5cAFgX1B0HXjD8kJ9tLetjz+PaoY8A1x+WrsQszK8lJ/ztuHUgy MofMA5dvYJPGJ07d6iyRWB9X3SDqkDXcBKq2Qv24= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Anders Kaseorg , Luca Coelho , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 056/187] Revert "iwlwifi: assign directly to iwl_trans->cfg in QuZ detection" Date: Fri, 27 Dec 2019 12:38:44 -0500 Message-Id: <20191227174055.4923-56-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227174055.4923-1-sashal@kernel.org> References: <20191227174055.4923-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Anders Kaseorg [ Upstream commit db5cce1afc8d2475d2c1c37c2a8267dd0e151526 ] This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99. Both that commit and commit 809805a820c6445f7a701ded24fdc6bbc841d1e4 attempted to fix the same bug (dead assignments to the local variable cfg), but they did so in incompatible ways. When they were both merged, independently of each other, the combination actually caused the bug to reappear, leading to a firmware crash on boot for some cards. https://bugzilla.kernel.org/show_bug.cgi?id=205719 Signed-off-by: Anders Kaseorg Acked-by: Luca Coelho Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index 040cec17d3ad..b0b7eca1754e 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1111,18 +1111,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* same thing for QuZ... */ if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) { - if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr) - iwl_trans->cfg = &iwl_ax101_cfg_quz_hr; - else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr) - iwl_trans->cfg = &iwl_ax201_cfg_quz_hr; - else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; - else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) - iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; + if (cfg == &iwl_ax101_cfg_qu_hr) + cfg = &iwl_ax101_cfg_quz_hr; + else if (cfg == &iwl_ax201_cfg_qu_hr) + cfg = &iwl_ax201_cfg_quz_hr; + else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0) + cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc; + else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0) + cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc; } #endif -- 2.20.1