* [PATCH -next] spi: sirf: fix error return code in spi_sirfsoc_probe()
@ 2013-08-23 0:33 Wei Yongjun
2013-08-23 9:37 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-08-23 0:33 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
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 <yongjun_wei@trendmicro.com.cn>
---
drivers/spi/spi-sirf.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 62c92c3..9b41254 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH -next] spi: sirf: fix error return code in spi_sirfsoc_probe()
2013-08-23 0:33 [PATCH -next] spi: sirf: fix error return code in spi_sirfsoc_probe() Wei Yongjun
@ 2013-08-23 9:37 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2013-08-23 9:37 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 23, 2013 at 08:33:39AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-23 9:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-23 0:33 [PATCH -next] spi: sirf: fix error return code in spi_sirfsoc_probe() Wei Yongjun
2013-08-23 9:37 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.