Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1154eb51 authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman
Browse files

staging: slicoss: fix error return code in slic_entry_probe() 



Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d398f56e

drivers/staging/slicoss/slicoss.c

+11 −7
Original line number Diff line number Diff line
@@ -3651,18 +3651,21 @@ static int slic_entry_probe(struct pci_dev *pcidev, 


	if (!pci_set_dma_mask(pcidev, DMA_BIT_MASK(64))) {

		pci_using_dac = 1;

		if (pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64))) {

		err = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64));

		if (err) {

			dev_err(&pcidev->dev, "unable to obtain 64-bit DMA for "

					"consistent allocations\n");

			goto err_out_disable_pci;

		}

	} else if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(32))) {

		pci_using_dac = 0;

		pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));

	} else {

		err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));

		if (err) {

			dev_err(&pcidev->dev, "no usable DMA configuration\n");

			goto err_out_disable_pci;

		}

		pci_using_dac = 0;

		pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));

	}



	err = pci_request_regions(pcidev, DRV_NAME);

	if (err) {
@@ -3696,6 +3699,7 @@ static int slic_entry_probe(struct pci_dev *pcidev, 
	if (!memmapped_ioaddr) {

		dev_err(&pcidev->dev, "cannot remap MMIO region %lx @ %lx\n",

			mmio_len, mmio_start);

		err = -ENOMEM;

		goto err_out_free_netdev;

	}
@@ -3706,8 +3710,8 @@ static int slic_entry_probe(struct pci_dev *pcidev, 
	slic_init_adapter(netdev,

			  pcidev, pci_tbl_entry, memmapped_ioaddr, cards_found);



	status = slic_card_locate(adapter);

	if (status) {

	err = slic_card_locate(adapter);

	if (err) {

		dev_err(&pcidev->dev, "cannot locate card\n");

		goto err_out_free_mmio_region;

	}