diff mbox series

mtd:rawnand: brcmnand: Fix PM resume crash

Message ID 20200502204137.37134-1-kdasu.kdev@gmail.com
State Changes Requested
Delegated to: Miquel Raynal
Headers show
Series mtd:rawnand: brcmnand: Fix PM resume crash | expand

Commit Message

Kamal Dasu May 2, 2020, 8:41 p.m. UTC
This change fixes crash observed on PM resume. This bug
was introduced in the change made for flash-edu support.

Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma transfers")

Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
---
 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Florian Fainelli May 2, 2020, 8:52 p.m. UTC | #1
On 5/2/2020 1:41 PM, Kamal Dasu wrote:
> This change fixes crash observed on PM resume. This bug
> was introduced in the change made for flash-edu support.
> 
> Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma transfers")
> 
> Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Richard Weinberger May 19, 2020, 8:26 a.m. UTC | #2
On Sat, May 2, 2020 at 10:52 PM Florian Fainelli <f.fainelli@gmail.com> wrote:
>
>
>
> On 5/2/2020 1:41 PM, Kamal Dasu wrote:
> > This change fixes crash observed on PM resume. This bug
> > was introduced in the change made for flash-edu support.
> >
> > Fixes: a5d53ad26a8b ("mtd: rawnand: brcmnand: Add support for flash-edu for dma transfers")
> >
> > Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
>
> Acked-by: Florian Fainelli <f.fainelli@gmail.com>
> --
> Florian

Applied for fixes, thanks!
diff mbox series

Patch

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index e4e3ceeac38f..8f9ffb46a09f 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -2728,9 +2728,8 @@  static int brcmnand_resume(struct device *dev)
 		flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);
 	}
 
-	if (has_edu(ctrl))
+	if (has_edu(ctrl)) {
 		ctrl->edu_config = edu_readl(ctrl, EDU_CONFIG);
-	else {
 		edu_writel(ctrl, EDU_CONFIG, ctrl->edu_config);
 		edu_readl(ctrl, EDU_CONFIG);
 		brcmnand_edu_init(ctrl);