From: Kamal Dasu <kdasu.k...@gmail.com>

[ Upstream commit bee3ab8bdd3b13faf08e5b6e0218f59b0a49fcc3 ]

When flash-dma is absent do not default to using flash-edu.
Make sure flash-edu is enabled before setting EDU transfer
function.

Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma 
transfers")
Signed-off-by: Kamal Dasu <kdasu.k...@gmail.com>
Signed-off-by: Miquel Raynal <miquel.ray...@bootlin.com>
Link: 
https://lore.kernel.org/linux-mtd/20200612212902.21347-2-kdasu.k...@gmail.com
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c 
b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 968ff77039256..cdae2311a3b69 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -2960,8 +2960,9 @@ int brcmnand_probe(struct platform_device *pdev, struct 
brcmnand_soc *soc)
                if (ret < 0)
                        goto err;
 
-               /* set edu transfer function to call */
-               ctrl->dma_trans = brcmnand_edu_trans;
+               if (has_edu(ctrl))
+                       /* set edu transfer function to call */
+                       ctrl->dma_trans = brcmnand_edu_trans;
        }
 
        /* Disable automatic device ID config, direct addressing */
-- 
2.25.1



Reply via email to