]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: brcmnand: Don't default to edu transfer
authorKamal Dasu <kdasu.kdev@gmail.com>
Fri, 12 Jun 2020 21:29:01 +0000 (17:29 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:24:08 +0000 (08:24 +0200)
[ 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.kdev@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200612212902.21347-2-kdasu.kdev@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/nand/raw/brcmnand/brcmnand.c

index 968ff770392564f3c20a8f47d8c851069a6a3052..cdae2311a3b69de2d40cdcc43fd01d1924cf26ad 100644 (file)
@@ -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 */