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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=c5ceaba74083daf619bdb34d4871e297a177eebf
Commit:     c5ceaba74083daf619bdb34d4871e297a177eebf
Parent:     08263a9ae664b24fa777d20b365601534842b236
Author:     Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Wed Jun 21 08:26:43 2017 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Thu Jun 22 13:13:06 2017 -0700

    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: a62c24d755291 ("mtd: part: Add sysfs variable for offset of partition")
    Cc: Dan Ehrenberg <dehrenberg at chromium.org>
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/mtdpart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index bcec721..9434050 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -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;
 		}