42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 2af86f9d954ee86e9b1c492e025de37a1b6d2db8 Mon Sep 17 00:00:00 2001
|
|
From: Karthik D A <karthida@marvell.com>
|
|
Date: Fri, 15 Jul 2016 18:18:39 +0530
|
|
Subject: mwifiex: Fix request_irq() failure handling
|
|
|
|
It's been observed that request_irq() failure leads to a system crash
|
|
due to a bug in mwifiex driver.
|
|
When this failure happens, mwifiex_add_card() already takes care of
|
|
clearing and freeing adapter->card pointer. This patch removes the
|
|
redundant cleanup code causing crash.
|
|
|
|
Signed-off-by: Karthik D A <karthida@marvell.com>
|
|
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
|
index 22fe993..0faf4a2 100644
|
|
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
|
|
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
|
|
@@ -202,7 +202,6 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
|
|
if (mwifiex_add_card(card, &add_remove_card_sem, &pcie_ops,
|
|
MWIFIEX_PCIE)) {
|
|
pr_err("%s failed\n", __func__);
|
|
- kfree(card);
|
|
return -1;
|
|
}
|
|
|
|
@@ -2843,7 +2842,6 @@ static int mwifiex_pcie_request_irq(struct mwifiex_adapter *adapter)
|
|
"MRVL_PCIE", &card->share_irq_ctx);
|
|
if (ret) {
|
|
pr_err("request_irq failed: ret=%d\n", ret);
|
|
- adapter->card = NULL;
|
|
return -1;
|
|
}
|
|
|
|
--
|
|
cgit v0.12
|
|
|