diff mbox

mwifiex: fix adapter pointer dereference

Message ID 1398289253-21398-1-git-send-email-bzhao@marvell.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Bing Zhao April 23, 2014, 9:40 p.m. UTC
drivers/net/wireless/mwifiex/pcie.c:2252 mwifiex_pcie_fw_dump_work()
error: we previously assumed 'adapter' could be null (see line 2251)

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
---
 drivers/net/wireless/mwifiex/pcie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

John W. Linville April 25, 2014, 1:40 a.m. UTC | #1
I reverted the patch in question already.  If you rewrite it, please
be sure to account for this fix as appropriate.

Thanks,

John

On Wed, Apr 23, 2014 at 02:40:53PM -0700, Bing Zhao wrote:
> drivers/net/wireless/mwifiex/pcie.c:2252 mwifiex_pcie_fw_dump_work()
> error: we previously assumed 'adapter' could be null (see line 2251)
> 
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Bing Zhao <bzhao@marvell.com>
> ---
>  drivers/net/wireless/mwifiex/pcie.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
> index 51989b3..249fdbd 100644
> --- a/drivers/net/wireless/mwifiex/pcie.c
> +++ b/drivers/net/wireless/mwifiex/pcie.c
> @@ -2248,7 +2248,7 @@ static void mwifiex_pcie_fw_dump_work(struct work_struct *work)
>  	};
>  
>  	if (!adapter) {
> -		dev_err(adapter->dev, "Could not dump firmwware info\n");
> +		pr_err("adapter is null. Could not dump firmware info\n");
>  		return;
>  	}
>  
> -- 
> 1.8.2.3
> 
>
diff mbox

Patch

diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 51989b3..249fdbd 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -2248,7 +2248,7 @@  static void mwifiex_pcie_fw_dump_work(struct work_struct *work)
 	};
 
 	if (!adapter) {
-		dev_err(adapter->dev, "Could not dump firmwware info\n");
+		pr_err("adapter is null. Could not dump firmware info\n");
 		return;
 	}