diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2013-01-26 00:56:03 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-30 15:07:04 -0500 |
| commit | 3220712d3aa4f5df12b7305ce340f6d216a84477 (patch) | |
| tree | f0a3e0986984d9d53390af2506af853bd792504f /drivers/net/wireless | |
| parent | baf58b0e8f0e460e252e40f5fdf393b01a3cef7d (diff) | |
| download | blackbird-op-linux-3220712d3aa4f5df12b7305ce340f6d216a84477.tar.gz blackbird-op-linux-3220712d3aa4f5df12b7305ce340f6d216a84477.zip | |
mwifiex: don't return zero on failure paths in mwifiex_pcie_init()
If pci_iomap() fails in mwifiex_pcie_init(), it breaks off initialization,
deallocates all resources, but returns zero.
The patch adds -EIO as return value in this case.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 7415ac8c3ad7..df88e65595c8 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -1985,6 +1985,7 @@ static int mwifiex_pcie_init(struct mwifiex_adapter *adapter) card->pci_mmap = pci_iomap(pdev, 0, 0); if (!card->pci_mmap) { dev_err(adapter->dev, "iomap(0) error\n"); + ret = -EIO; goto err_iomap0; } ret = pci_request_region(pdev, 2, DRV_NAME); @@ -1995,6 +1996,7 @@ static int mwifiex_pcie_init(struct mwifiex_adapter *adapter) card->pci_mmap1 = pci_iomap(pdev, 2, 0); if (!card->pci_mmap1) { dev_err(adapter->dev, "iomap(2) error\n"); + ret = -EIO; goto err_iomap2; } |
