Title: [6167] trunk/drivers/mtd/maps/physmap.c: apply e480814f138cd5d78a8efe397756ba from mainline
- Revision
- 6167
- Author
- vapier
- Date
- 2009-03-10 15:02:52 -0500 (Tue, 10 Mar 2009)
Log Message
apply e480814f138cd5d78a8efe397756ba from mainline
Modified Paths
Diff
Modified: trunk/drivers/mtd/maps/physmap.c (6166 => 6167)
--- trunk/drivers/mtd/maps/physmap.c 2009-03-09 16:29:19 UTC (rev 6166)
+++ trunk/drivers/mtd/maps/physmap.c 2009-03-10 20:02:52 UTC (rev 6167)
@@ -29,6 +29,7 @@
struct map_info map[MAX_RESOURCES];
#ifdef CONFIG_MTD_PARTITIONS
int nr_parts;
+ struct mtd_partition *parts;
#endif
};
@@ -45,25 +46,26 @@
physmap_data = dev->dev.platform_data;
+#ifdef CONFIG_MTD_PARTITIONS
+ if (info->nr_parts) {
+ del_mtd_partitions(info->cmtd);
+ kfree(info->parts);
+ } else if (physmap_data->nr_parts)
+ del_mtd_partitions(info->cmtd);
+ else
+ del_mtd_device(info->cmtd);
+#else
+ del_mtd_device(info->cmtd);
+#endif
+
#ifdef CONFIG_MTD_CONCAT
- if (info->cmtd != info->mtd[0]) {
- del_mtd_device(info->cmtd);
+ if (info->cmtd != info->mtd[0])
mtd_concat_destroy(info->cmtd);
- }
#endif
for (i = 0; i < MAX_RESOURCES; i++) {
- if (info->mtd[i] != NULL) {
-#ifdef CONFIG_MTD_PARTITIONS
- if (info->nr_parts || physmap_data->nr_parts)
- del_mtd_partitions(info->mtd[i]);
- else
- del_mtd_device(info->mtd[i]);
-#else
- del_mtd_device(info->mtd[i]);
-#endif
+ if (info->mtd[i] != NULL)
map_destroy(info->mtd[i]);
- }
}
return 0;
}
@@ -81,9 +83,6 @@
int err = 0;
int i;
int devices_found = 0;
-#ifdef CONFIG_MTD_PARTITIONS
- struct mtd_partition *parts;
-#endif
physmap_data = dev->dev.platform_data;
if (physmap_data == NULL)
@@ -161,10 +160,11 @@
goto err_out;
#ifdef CONFIG_MTD_PARTITIONS
- err = parse_mtd_partitions(info->cmtd, part_probe_types, &parts, 0);
+ err = parse_mtd_partitions(info->cmtd, part_probe_types,
+ &info->parts, 0);
if (err > 0) {
- add_mtd_partitions(info->cmtd, parts, err);
- kfree(parts);
+ add_mtd_partitions(info->cmtd, info->parts, err);
+ info->nr_parts = err;
return 0;
}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
