From e17c264ba91059144d67ba7a7257c6089ed59ac4 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 6 Oct 2007 15:01:59 -0400 Subject: [PATCH] --- yaml --- r: 68531 b: refs/heads/master c: 49defc015ff58fda46a3afa3462dfdfa69bc8401 h: refs/heads/master i: 68529: 0c873f98e2da5e0c1527de1464789698d34f3acb 68527: 4a41e5c3962862aaada341f2286f8c80001a012d v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_base.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e9ce27765d49..7e3a75e1e177 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fcf8ce51e7acc4b66904c4e159690c9467606b5 +refs/heads/master: 49defc015ff58fda46a3afa3462dfdfa69bc8401 diff --git a/trunk/drivers/mtd/nand/nand_base.c b/trunk/drivers/mtd/nand/nand_base.c index d5691212058d..b4e0e7723894 100644 --- a/trunk/drivers/mtd/nand/nand_base.c +++ b/trunk/drivers/mtd/nand/nand_base.c @@ -2069,13 +2069,14 @@ int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr, erase_exit: ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO; - /* Do call back function */ - if (!ret) - mtd_erase_callback(instr); /* Deselect and wake up anyone waiting on the device */ nand_release_device(mtd); + /* Do call back function */ + if (!ret) + mtd_erase_callback(instr); + /* * If BBT requires refresh and erase was successful, rewrite any * selected bad block tables