Patch "mwifiex: set adapter->dev before starting to use mwifiex_dbg()" has been added to the 4.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
mwifiex: set adapter->dev before starting to use mwifiex_dbg()
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mwifiex-set-adapter-dev-before-starting-to-use-mwifiex_dbg.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ba1c7e45ec224cc8d2df33ecaee1946d48e79231Mon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Fri, 10 Mar 2017 17:39:22 -0800
Subject: mwifiex: set adapter->dev before starting to use mwifiex_dbg()
From: Brian Norris <[email protected]>
commit ba1c7e45ec224cc8d2df33ecaee1946d48e79231 upstream.
The mwifiex_dbg() log handler utilizes the struct device in adapter->dev. Without it, it decides not to print anything.
As of commit 2e02b5814217 ("mwifiex: Allow mwifiex early access to device structure"), we started assigning that pointer only after we finished mwifiex_register() -- this effectively neuters any mwifiex_dbg() logging done before this point.
Let's move the device assignment into mwifiex_register().
--- drivers/net/wireless/marvell/mwifiex/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/marvell/mwifiex/main.c +4 -4
@@ -57,8 +57,8 @@ MODULE_PARM_DESC(mfg_mode, "manufacturin* In case of any errors during inittialization, this function also ensures * proper cleanup before exiting. */ -static int mwifiex_register (void *card,struct mwifiex_if_ops *if_ops, -void **padapter) +static int mwifiex_register (void *card,struct device *dev, +struct mwifiex_if_ops *if_ops,void **padapter) {struct mwifiex_adapter *adapter;int i;
@@ -68,6 +68,7 @@ static int mwifiex_register(void *card,return -ENOMEM ; *padapter = adapter; + adapter->dev = dev; adapter->card = card;/* Save interface specific operations in adapter */
@@ -1618,12 +1619,11 @@ mwifiex_add_card(void *card, struct comp {struct mwifiex_adapter *adapter; -if (mwifiex_register (card, if_ops, (void **)&adapter)) { +if (mwifiex_register (card, dev, if_ops, (void **)&adapter)) {pr_err ("%s: software init failed\n" , __func__); goto err_init_sw; } - adapter->dev = dev;mwifiex_probe_of (adapter); adapter->iface_type = iface_type;
Patches currently in stable-queue which might be from [email protected] are
queue-4.10/mwifiex-don-t-enable-disable-irq-0-during-suspend-resume.patch queue-4.10/mwifiex-debugfs-fix-sometimes-off-by-1-ssid-print.patch queue-4.10/mwifiex-set-adapter-dev-before-starting-to-use-mwifiex_dbg.patch