summaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-02-17 22:53:20 +0300
committerMiquel Raynal <miquel.raynal@bootlin.com>2021-03-11 11:37:49 +0300
commitcb4543054c5c4fd33df960b41d7b483ebca8e786 (patch)
tree71ed082188cd0b611b8aa111554457fce519800b /drivers/mtd
parentd38c2b93258a0e19dee3b04c2156f6c9077bd498 (diff)
downloadlinux-cb4543054c5c4fd33df960b41d7b483ebca8e786.tar.xz
mtd: don't lock when recursively deleting partitions
When recursively deleting partitions, don't acquire the masters partition lock twice. Otherwise the process ends up in a deadlocked state. Fixes: 46b5889cc2c5 ("mtd: implement proper partition handling") Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Link: https://lore.kernel.org/linux-mtd/20210217195320.893253-1-mail@david-bauer.net
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/mtdpart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 12ca4f19cb14..665fd9020b76 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -331,7 +331,7 @@ static int __del_mtd_partitions(struct mtd_info *mtd)
list_for_each_entry_safe(child, next, &mtd->partitions, part.node) {
if (mtd_has_partitions(child))
- del_mtd_partitions(child);
+ __del_mtd_partitions(child);
pr_info("Deleting %s MTD partition\n", child->name);
ret = del_mtd_device(child);