2013-05-14 02:30:24

by Wei Yongjun

Subject: [PATCH v2] mtd: fsmc_nand: fix error return code in fsmc_nand_probe()

From: Wei Yongjun <[email protected]>

Fix to return -ENODEV in the dma channel request error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
v1 -> v2: set ret for error cases only
---
drivers/mtd/nand/fsmc_nand.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 0e5a1d9..95e1768 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -1035,12 +1035,14 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
host->read_dma_chan = dma_request_channel(mask, filter,
pdata->read_dma_priv);
if (!host->read_dma_chan) {
+ ret = -ENODEV;
dev_err(&pdev->dev, "Unable to get read dma channel\n");
goto err_req_read_chnl;
}
host->write_dma_chan = dma_request_channel(mask, filter,
pdata->write_dma_priv);
if (!host->write_dma_chan) {
+ ret = -ENODEV;
dev_err(&pdev->dev, "Unable to get write dma channel\n");
goto err_req_write_chnl;
}

2013-05-14 04:00:17

by Viresh Kumar

Subject: Re: [PATCH v2] mtd: fsmc_nand: fix error return code in fsmc_nand_probe()

On 14 May 2013 08:00, Wei Yongjun <[email protected]> wrote:
> From: Wei Yongjun <[email protected]>
>
> Fix to return -ENODEV in the dma channel request error handling
> case instead of 0, as done elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> v1 -> v2: set ret for error cases only
> ---
> drivers/mtd/nand/fsmc_nand.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
> index 0e5a1d9..95e1768 100644
> --- a/drivers/mtd/nand/fsmc_nand.c
> +++ b/drivers/mtd/nand/fsmc_nand.c
> @@ -1035,12 +1035,14 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
> host->read_dma_chan = dma_request_channel(mask, filter,
> pdata->read_dma_priv);
> if (!host->read_dma_chan) {
> + ret = -ENODEV;
> dev_err(&pdev->dev, "Unable to get read dma channel\n");
> goto err_req_read_chnl;
> }
> host->write_dma_chan = dma_request_channel(mask, filter,
> pdata->write_dma_priv);
> if (!host->write_dma_chan) {
> + ret = -ENODEV;
> dev_err(&pdev->dev, "Unable to get write dma channel\n");
> goto err_req_write_chnl;
> }
>

Acked-by: Viresh Kumar <[email protected]>