Skip to content
Snippets Groups Projects
Commit 3234eba0 authored by Niravkumar L Rabara's avatar Niravkumar L Rabara Committed by Frieder Schrempf
Browse files

mtd: rawnand: cadence: fix error code in cadence_nand_init()


commit 2b9df00cded911e2ca2cfae5c45082166b24f8aa upstream.

Replace dma_request_channel() with dma_request_chan_by_mask() and use
helper functions to return proper error code instead of fixed -EBUSY.

Fixes: ec4ba01e ("mtd: rawnand: Add new Cadence NAND driver to MTD subsystem")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarNiravkumar L Rabara <niravkumar.l.rabara@intel.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5343647
No related branches found
No related tags found
1 merge request!192🤖 Sync Bot: Update v6.12-ktn to Latest Stable Kernel (v6.12.17)
...@@ -2904,11 +2904,10 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl) ...@@ -2904,11 +2904,10 @@ static int cadence_nand_init(struct cdns_nand_ctrl *cdns_ctrl)
dma_cap_set(DMA_MEMCPY, mask); dma_cap_set(DMA_MEMCPY, mask);
if (cdns_ctrl->caps1->has_dma) { if (cdns_ctrl->caps1->has_dma) {
cdns_ctrl->dmac = dma_request_channel(mask, NULL, NULL); cdns_ctrl->dmac = dma_request_chan_by_mask(&mask);
if (!cdns_ctrl->dmac) { if (IS_ERR(cdns_ctrl->dmac)) {
dev_err(cdns_ctrl->dev, ret = dev_err_probe(cdns_ctrl->dev, PTR_ERR(cdns_ctrl->dmac),
"Unable to get a DMA channel\n"); "%d: Failed to get a DMA channel\n", ret);
ret = -EBUSY;
goto disable_irq; goto disable_irq;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment