aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/ubi/cdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/ubi/cdev.c')
-rw-r--r--drivers/mtd/ubi/cdev.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index f8e0f68f2186..8087b0462771 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -810,9 +810,7 @@ static int rename_volumes(struct ubi_device *ubi,
810 re->desc->vol->vol_id, re->desc->vol->name); 810 re->desc->vol->vol_id, re->desc->vol->name);
811 } 811 }
812 812
813 mutex_lock(&ubi->volumes_mutex);
814 err = ubi_rename_volumes(ubi, &rename_list); 813 err = ubi_rename_volumes(ubi, &rename_list);
815 mutex_unlock(&ubi->volumes_mutex);
816 814
817out_free: 815out_free:
818 list_for_each_entry_safe(re, re1, &rename_list, list) { 816 list_for_each_entry_safe(re, re1, &rename_list, list) {
@@ -952,9 +950,9 @@ static long ubi_cdev_ioctl(struct file *file, unsigned int cmd,
952 break; 950 break;
953 } 951 }
954 952
955 mutex_lock(&ubi->mult_mutex); 953 mutex_lock(&ubi->volumes_mutex);
956 err = rename_volumes(ubi, req); 954 err = rename_volumes(ubi, req);
957 mutex_unlock(&ubi->mult_mutex); 955 mutex_unlock(&ubi->volumes_mutex);
958 kfree(req); 956 kfree(req);
959 break; 957 break;
960 } 958 }