From: Hugh Dickins <hughd@google.com>
To: Luca Coelho <luciano.coelho@intel.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
Mordechay Goodstein <mordechay.goodstein@intel.com>,
Jiri Kosina <jikos@kernel.org>, Hugh Dickins <hughd@google.com>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] iwlwifi: fix DVM boot regression in 5.12-rc
Date: Sat, 6 Mar 2021 11:49:13 -0800 (PST) [thread overview]
Message-ID: <alpine.LSU.2.11.2103061147270.1285@eggly.anvils> (raw)
In-Reply-To: <alpine.LSU.2.11.2103061139200.1285@eggly.anvils>
No time_point op has been provided for DVM: check for NULL before
calling, to fix the oops (blank screen booting non-modular kernel).
Fixes: d01293154c0a ("iwlwifi: dbg: add op_mode callback for collecting debug data.")
Signed-off-by: Hugh Dickins <hughd@google.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- 5.12-rc2/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-02-28 16:58:55.058425551 -0800
+++ linux/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h 2021-03-05 20:59:14.156217412 -0800
@@ -205,7 +205,8 @@ static inline void iwl_op_mode_time_poin
enum iwl_fw_ini_time_point tp_id,
union iwl_dbg_tlv_tp_data *tp_data)
{
- op_mode->ops->time_point(op_mode, tp_id, tp_data);
+ if (op_mode->ops->time_point)
+ op_mode->ops->time_point(op_mode, tp_id, tp_data);
}
#endif /* __iwl_op_mode_h__ */
next prev parent reply other threads:[~2021-03-06 19:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 19:47 [PATCH 1/2] iwlwifi: fix DVM build regression in 5.12-rc Hugh Dickins
2021-03-06 19:49 ` Hugh Dickins [this message]
2021-03-06 19:53 ` [PATCH 2/2] iwlwifi: fix DVM boot " Sedat Dilek
2021-03-06 19:52 ` [PATCH 1/2] iwlwifi: fix DVM build " Sedat Dilek
2021-03-06 20:27 ` Hugh Dickins
2021-03-06 20:32 ` Sedat Dilek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LSU.2.11.2103061147270.1285@eggly.anvils \
--to=hughd@google.com \
--cc=jikos@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=mordechay.goodstein@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).