| From 587b7e163631756fd96558564614df2474d936e5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 15 Feb 2021 18:58:49 +0300 |
| Subject: mtd: rawnand: fsmc: Fix error code in fsmc_nand_probe() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit e7a97528e3c787802d8c643d6ab2f428511bb047 ] |
| |
| If dma_request_channel() fails then the probe fails and it should |
| return a negative error code, but currently it returns success. |
| |
| fixes: 4774fb0a48aa ("mtd: nand/fsmc: Add DMA support") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/YCqaOZ83OvPOzLwh@mwanda |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mtd/nand/raw/fsmc_nand.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/mtd/nand/raw/fsmc_nand.c b/drivers/mtd/nand/raw/fsmc_nand.c |
| index 0101c0fab50a..a24e2f57fa68 100644 |
| --- a/drivers/mtd/nand/raw/fsmc_nand.c |
| +++ b/drivers/mtd/nand/raw/fsmc_nand.c |
| @@ -1077,11 +1077,13 @@ static int __init fsmc_nand_probe(struct platform_device *pdev) |
| host->read_dma_chan = dma_request_channel(mask, filter, NULL); |
| if (!host->read_dma_chan) { |
| dev_err(&pdev->dev, "Unable to get read dma channel\n"); |
| + ret = -ENODEV; |
| goto disable_clk; |
| } |
| host->write_dma_chan = dma_request_channel(mask, filter, NULL); |
| if (!host->write_dma_chan) { |
| dev_err(&pdev->dev, "Unable to get write dma channel\n"); |
| + ret = -ENODEV; |
| goto release_dma_read_chan; |
| } |
| } |
| -- |
| 2.30.2 |
| |
