Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3674783pxb; Mon, 24 Jan 2022 15:04:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIRzCARYfr35HYhsONECUary73KmrDiw/z94guEOTetkLQ2ha6G0Ei6ZH6ViV3VM9rlLyX X-Received: by 2002:a63:603:: with SMTP id 3mr5383459pgg.538.1643065461603; Mon, 24 Jan 2022 15:04:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643065461; cv=none; d=google.com; s=arc-20160816; b=aI6pxn7jeOc0FqKpsW35maHkbG5csGeUP6Oj8b3r70UZ+MvlGZ9msk/ih5aAo/kSe3 Teg3LGEYKOxv+WWrRr1k0kqn+rR2jK4+hlMBsGQf1gkxl4dYnGroZLL/0bQxVu2/f8zM rqiyHRSyV/DHd+HysfaEHmiBapfdhvwC4RAHSoedXRQx0aPs1IzJm40TM8w6yaVGsFxw RjCGnr1qcZ5M317fNSNcwU6ebIYTHn4gps3HtOzK+3Ps+pGO0HcqILdD3TRcGhYgGS/z x4Ukr6P/uHSq7IIMyZct+GzBzUGWWmKJ/YhROqLtWATi2nlqGaXjnnOFPQZyGsTVQ+1C tnlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2KkqooXRyfTGzJLLp5IYow36mzpu2wLd7782d0aIxq4=; b=Dg7RhQ/bGLAxKBuGVKhEK9rZ/jcCKXgW1l8bhrbqAyUFXj6LrnwHYjScFDtDCHycOm 7sEAXqSr1ZCEUbR4TA+XRXzYRob9rqp7g8SGu4MFb9CkK0Qhj4CeRx1K+nEOygVBWdMu 84XRWz8vRJ0OP/EtAdPaWc0XL8iARVxCQidl6LqQ0ImPEr04VECfyTqGigihhVWshzM6 z4ZED26oBUZTPnozUVaLnjMuvSJpSbQWsIyJlaPwxvEylLkRQPMf9FBiqbpG9i+UMElY zo0y958nvDptg6O1yLF1YId9lRIVzN+a1TwvkGcQrIbUA9HpLJ9I/u6EKSXHARiGiHo0 MsFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CTEnvNpH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h191si6360131pge.846.2022.01.24.15.04.09; Mon, 24 Jan 2022 15:04:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CTEnvNpH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381732AbiAXW6x (ORCPT + 99 others); Mon, 24 Jan 2022 17:58:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1575047AbiAXV7F (ORCPT ); Mon, 24 Jan 2022 16:59:05 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AE81C02B8D1; Mon, 24 Jan 2022 12:39:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6CD9661008; Mon, 24 Jan 2022 20:39:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BAAFC340E5; Mon, 24 Jan 2022 20:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643056766; bh=0db0lA3LF46u41ABe7SmiK02EzboUvOSIxyIoCE8fDY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CTEnvNpH+o9IK1yeabcl4AdHkQw+5AsvDaA21VhiGKaqt12i61AXPtQ5gHA9USYxk E3mFlZdhM7b7LLENAhXpv8d9sal3ObXR8uhGbZLizwjdrjsFmv6DeBFK1gs5icjXNR N580xb//mERHJtp0aVQ7EMhvgK846QaI1lFXx6VE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , Luca Coelho , Sasha Levin Subject: [PATCH 5.15 576/846] iwlwifi: remove module loading failure message Date: Mon, 24 Jan 2022 19:41:33 +0100 Message-Id: <20220124184120.908064995@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124184100.867127425@linuxfoundation.org> References: <20220124184100.867127425@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 6518f83ffa51131daaf439b66094f684da3fb0ae ] When CONFIG_DEBUG_TEST_DRIVER_REMOVE is set, iwlwifi crashes when the opmode module cannot be loaded, due to completing the completion before using drv->dev, which can then already be freed. Fix this by removing the (fairly useless) message. Moving the completion later causes a deadlock instead, so that's not an option. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/20211210091245.289008-2-luca@coelho.fi Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 2206f66f69940..b7f7b9c5b670c 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -1597,15 +1597,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) * else from proceeding if the module fails to load * or hangs loading. */ - if (load_module) { + if (load_module) request_module("%s", op->name); -#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR - if (err) - IWL_ERR(drv, - "failed to load module %s (error %d), is dynamic loading enabled?\n", - op->name, err); -#endif - } failure = false; goto free; -- 2.34.1