Commit c5ceaba7 authored Jun 21, 2017 by Rafał Miłecki Committed by Brian Norris Jun 22, 2017

mtd: partitions: remove sysfs files when deleting all master's partitions



When support for sysfs "offset" file was added it missed to update the
del_mtd_partitions function. It deletes partitions just like
mtd_del_partition does so both should also take care of removing sysfs
files.

This change moves sysfs_remove_files call to the shared function to fix
this issue.

Fixes: a62c24d7 ("mtd: part: Add sysfs variable for offset of partition")
Cc: Dan Ehrenberg <dehrenberg@chromium.org>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

parent 08263a9a

drivers/mtd/mtdpart.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -660,6 +660,8 @@ static int __mtd_del_partition(struct mtd_part *priv)
		{
		int err;

		sysfs_remove_files(&priv->mtd.dev.kobj, mtd_partition_attrs);

		err = del_mtd_device(&priv->mtd);
		if (err)
		return err;
		@@ -700,8 +702,6 @@ int mtd_del_partition(struct mtd_info *master, int partno)
		list_for_each_entry_safe(slave, next, &mtd_partitions, list)
		if ((slave->master == master) &&
		(slave->mtd.index == partno)) {
		sysfs_remove_files(&slave->mtd.dev.kobj,
		mtd_partition_attrs);
		ret = __mtd_del_partition(slave);
		break;
		}