RE: [PATCH] mwifiex: don't return zero on failure paths inmwifiex_pcie_init()

From: Bing Zhao
Date: Fri Jan 25 2013 - 16:11:18 EST


Hi Alexey,

Thanks for the patch.

> 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@xxxxxxxxx>

Acked-by: Bing Zhao <bzhao@xxxxxxxxxxx>

Thanks,
Bing

> ---
> drivers/net/wireless/mwifiex/pcie.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
> index 13fbc4e..9d9349c 100644
> --- a/drivers/net/wireless/mwifiex/pcie.c
> +++ b/drivers/net/wireless/mwifiex/pcie.c
> @@ -1739,6 +1739,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);
> @@ -1749,6 +1750,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;
> }
>
> --
> 1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/