spi: sirf: fix error return code in spi_sirfsoc_probe()
PATCH 1/1 spi: sirf: fix error return code in spi_sirfsoc_probe()
From: Wei Yongjun <[email protected]>
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
Signed-off-by Wei Yongjun <[email protected]>
--- drivers/spi/spi-sirf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/spi/spi-sirf.c +5 -1
@@ -655,12 +655,14 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) (void *)rx_dma_ch);if (!sspi->rx_chan) {dev_err (&pdev->dev,"can not allocate rx dma channel\n" ); + ret = -ENODEV ; goto free_master; } sspi->tx_chan =dma_request_channel (dma_cap_mask, (dma_filter_fn )sirfsoc_dma_filter_id, (void *)tx_dma_ch);if (!sspi->tx_chan) {dev_err (&pdev->dev,"can not allocate tx dma channel\n" ); + ret = -ENODEV ; goto free_rx_dma; }
@@ -683,8 +685,10 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)writel (0 , sspi->base +SIRFSOC_SPI_DUMMY_DELAY_CTL ); sspi->dummypage =kmalloc (2 *PAGE_SIZE ,GFP_KERNEL ); -if (!sspi->dummypage) +if (!sspi->dummypage) { + ret = -ENOMEM ; goto free_clk; + } ret =spi_bitbang_start (&sspi->bitbang);if (ret)
Mark Brown
maintainerPATCH 1/1 spi: sirf: fix error return code in spi_sirfsoc_probe()
Quoted 4 lines · Wei Yongjun
From: Wei Yongjun <[email protected]>
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function.
applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130823/af72de61/attachment.sig>