Unverified Commit 893aa09e authored by Wang Ming's avatar Wang Ming Committed by Mark Brown
Browse files

spi: Use dev_err_probe instead of dev_err 



It is possible that dma_request_chan will return EPROBE_DEFER,
which means that dev is not ready yet. In this case,
dev_err(dev), there will be no output. This patch fixes the bug.

Signed-off-by: default avatarWang Ming <machel@vivo.com>
Link: https://lore.kernel.org/r/20230726105457.3743-1-machel@vivo.com


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

drivers/spi/spi-bcm2835.c

+4 −4
Original line number Diff line number Diff line
@@ -903,15 +903,15 @@ static int bcm2835_dma_init(struct spi_controller *ctlr, struct device *dev, 
	/* get tx/rx dma */

	ctlr->dma_tx = dma_request_chan(dev, "tx");

	if (IS_ERR(ctlr->dma_tx)) {

		dev_err(dev, "no tx-dma configuration found - not using dma mode\n");

		ret = PTR_ERR(ctlr->dma_tx);

		ret = dev_err_probe(dev, PTR_ERR(ctlr->dma_tx),

			"no tx-dma configuration found - not using dma mode\n");

		ctlr->dma_tx = NULL;

		goto err;

	}

	ctlr->dma_rx = dma_request_chan(dev, "rx");

	if (IS_ERR(ctlr->dma_rx)) {

		dev_err(dev, "no rx-dma configuration found - not using dma mode\n");

		ret = PTR_ERR(ctlr->dma_rx);

		ret = dev_err_probe(dev, PTR_ERR(ctlr->dma_rx),

			"no rx-dma configuration found - not using dma mode\n");

		ctlr->dma_rx = NULL;

		goto err_release;

	}