diff options
| author | Alexey Khoroshilov <khoroshilov@ispras.ru> | 2013-01-19 01:24:01 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-22 16:01:30 -0500 |
| commit | a2ca8ecb8ffc985e82c9570c3837408f7efe8c9d (patch) | |
| tree | 571b1266c73e1c7ab993245c792a9feb9e96cd98 | |
| parent | 7532c7d0138a4984eb0c8b12b9c310cf8a6d6977 (diff) | |
| download | blackbird-op-linux-a2ca8ecb8ffc985e82c9570c3837408f7efe8c9d.tar.gz blackbird-op-linux-a2ca8ecb8ffc985e82c9570c3837408f7efe8c9d.zip | |
mwl8k: don't return zero on failure paths in mwl8k_probe[_hw]()
If pci_iomap() fails in mwl8k_probe(), it breaks off initialization,
deallocates all resources, but returns zero.
There is a similar issue when priv->rxd_ops is NULL in mwl8k_probe_hw().
The patch adds proper error code return values.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/mwl8k.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index a9c078899252..68357641c414 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -5555,6 +5555,7 @@ static int mwl8k_probe_hw(struct ieee80211_hw *hw) if (priv->rxd_ops == NULL) { wiphy_err(hw->wiphy, "Driver does not have AP firmware image support for this hardware\n"); + rc = -ENOENT; goto err_stop_firmware; } } else { @@ -5901,6 +5902,7 @@ static int mwl8k_probe(struct pci_dev *pdev, priv->sram = pci_iomap(pdev, 0, 0x10000); if (priv->sram == NULL) { wiphy_err(hw->wiphy, "Cannot map device SRAM\n"); + rc = -EIO; goto err_iounmap; } @@ -5913,6 +5915,7 @@ static int mwl8k_probe(struct pci_dev *pdev, priv->regs = pci_iomap(pdev, 2, 0x10000); if (priv->regs == NULL) { wiphy_err(hw->wiphy, "Cannot map device registers\n"); + rc = -EIO; goto err_iounmap; } } |
