Unverified Commit dd4441ab authored by Wei Yongjun's avatar Wei Yongjun Committed by Mark Brown
Browse files

spi: bcm2835: Fix error return code in bcm2835_dma_init() 



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

Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Link: https://lore.kernel.org/r/20200506125607.90952-1-weiyongjun1@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b684514

drivers/spi/spi-bcm2835.c

+4 −0
Original line number Diff line number Diff line
@@ -940,6 +940,7 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, 
	if (dma_mapping_error(ctlr->dma_tx->device->dev, bs->fill_tx_addr)) {

		dev_err(dev, "cannot map zero page - not using DMA mode\n");

		bs->fill_tx_addr = 0;

		ret = -ENOMEM;

		goto err_release;

	}
@@ -949,6 +950,7 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, 
						     DMA_MEM_TO_DEV, 0);

	if (!bs->fill_tx_desc) {

		dev_err(dev, "cannot prepare fill_tx_desc - not using DMA mode\n");

		ret = -ENOMEM;

		goto err_release;

	}
@@ -979,6 +981,7 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, 
	if (dma_mapping_error(ctlr->dma_rx->device->dev, bs->clear_rx_addr)) {

		dev_err(dev, "cannot map clear_rx_cs - not using DMA mode\n");

		bs->clear_rx_addr = 0;

		ret = -ENOMEM;

		goto err_release;

	}
@@ -989,6 +992,7 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, 
					   DMA_MEM_TO_DEV, 0);

		if (!bs->clear_rx_desc[i]) {

			dev_err(dev, "cannot prepare clear_rx_desc - not using DMA mode\n");

			ret = -ENOMEM;

			goto err_release;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE