Skip to content

Commit

Permalink
mwifiex: fix memory leak issue for sdio and pcie cards
Browse files Browse the repository at this point in the history
When driver is failed to load, card pointer doesn't get
freed. We will free it in cleanup handler which is called
in failure as well as unload path.
Also, update drvdata in init/cleanup handlers instead of
register/unregister handlers.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Amitkumar Karwar authored and John W. Linville committed Nov 15, 2013
1 parent 98a4635 commit 3c59e32
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/mwifiex/pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
}

mwifiex_remove_card(card->adapter, &add_remove_card_sem);
kfree(card);
}

static void mwifiex_pcie_shutdown(struct pci_dev *pdev)
Expand Down Expand Up @@ -2313,6 +2312,7 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter *adapter)
pci_release_region(pdev, 0);
pci_set_drvdata(pdev, NULL);
}
kfree(card);
}

/*
Expand Down
7 changes: 4 additions & 3 deletions drivers/net/wireless/mwifiex/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ mwifiex_sdio_remove(struct sdio_func *func)
}

mwifiex_remove_card(card->adapter, &add_remove_card_sem);
kfree(card);
}

/*
Expand Down Expand Up @@ -1745,7 +1744,6 @@ mwifiex_unregister_dev(struct mwifiex_adapter *adapter)
sdio_claim_host(card->func);
sdio_disable_func(card->func);
sdio_release_host(card->func);
sdio_set_drvdata(card->func, NULL);
}
}

Expand Down Expand Up @@ -1773,7 +1771,6 @@ static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
return ret;
}

sdio_set_drvdata(func, card);

adapter->dev = &func->dev;

Expand Down Expand Up @@ -1801,6 +1798,8 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
int ret;
u8 sdio_ireg;

sdio_set_drvdata(card->func, card);

/*
* Read the HOST_INT_STATUS_REG for ACK the first interrupt got
* from the bootloader. If we don't do this we get a interrupt
Expand Down Expand Up @@ -1883,6 +1882,8 @@ static void mwifiex_cleanup_sdio(struct mwifiex_adapter *adapter)
kfree(card->mpa_rx.len_arr);
kfree(card->mpa_tx.buf);
kfree(card->mpa_rx.buf);
sdio_set_drvdata(card->func, NULL);
kfree(card);
}

/*
Expand Down

0 comments on commit 3c59e32

Please sign in to comment.