Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ded1db97 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

mtd: onenand: fix deadlock in onenand_block_markbad 



commit 5e64c29e98bfbba1b527b0a164f9493f3db9e8cb upstream.

Commit 5942ddbc ("mtd: introduce mtd_block_markbad interface")
incorrectly changed onenand_block_markbad() to call mtd_block_markbad
instead of onenand_chip's block_markbad function. As a result the function
will now recurse and deadlock. Fix by reverting the change.

Fixes: 5942ddbc ("mtd: introduce mtd_block_markbad interface")
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5dc7e939

drivers/mtd/onenand/onenand_base.c

+2 −1
Original line number Diff line number Diff line
@@ -2599,6 +2599,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs) 
 */

static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)

{

	struct onenand_chip *this = mtd->priv;

	int ret;



	ret = onenand_block_isbad(mtd, ofs);
@@ -2610,7 +2611,7 @@ static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	}



	onenand_get_device(mtd, FL_WRITING);

	ret = mtd_block_markbad(mtd, ofs);

	ret = this->block_markbad(mtd, ofs);

	onenand_release_device(mtd);

	return ret;

}