diff options
Diffstat (limited to 'drivers/mtd/maps/omap-toto-flash.c')
-rw-r--r-- | drivers/mtd/maps/omap-toto-flash.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c index da36e8dddd17..dc3765270057 100644 --- a/drivers/mtd/maps/omap-toto-flash.c +++ b/drivers/mtd/maps/omap-toto-flash.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * (C) 2002 MontVista Software, Inc. | 6 | * (C) 2002 MontVista Software, Inc. |
7 | * | 7 | * |
8 | * $Id: omap-toto-flash.c,v 1.3 2004/09/16 23:27:13 gleixner Exp $ | 8 | * $Id: omap-toto-flash.c,v 1.5 2005/11/07 11:14:27 gleixner Exp $ |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/config.h> | 11 | #include <linux/config.h> |
@@ -38,7 +38,7 @@ static struct map_info omap_toto_map_flash = { | |||
38 | .virt = (void __iomem *)OMAP_TOTO_FLASH_BASE, | 38 | .virt = (void __iomem *)OMAP_TOTO_FLASH_BASE, |
39 | }; | 39 | }; |
40 | 40 | ||
41 | 41 | ||
42 | static struct mtd_partition toto_flash_partitions[] = { | 42 | static struct mtd_partition toto_flash_partitions[] = { |
43 | { | 43 | { |
44 | .name = "BootLoader", | 44 | .name = "BootLoader", |
@@ -54,21 +54,21 @@ static struct mtd_partition toto_flash_partitions[] = { | |||
54 | .name = "EnvArea", /* bottom 64KiB for env vars */ | 54 | .name = "EnvArea", /* bottom 64KiB for env vars */ |
55 | .size = MTDPART_SIZ_FULL, | 55 | .size = MTDPART_SIZ_FULL, |
56 | .offset = MTDPART_OFS_APPEND, | 56 | .offset = MTDPART_OFS_APPEND, |
57 | } | 57 | } |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static struct mtd_partition *parsed_parts; | 60 | static struct mtd_partition *parsed_parts; |
61 | 61 | ||
62 | static struct mtd_info *flash_mtd; | 62 | static struct mtd_info *flash_mtd; |
63 | 63 | ||
64 | static int __init init_flash (void) | 64 | static int __init init_flash (void) |
65 | { | 65 | { |
66 | 66 | ||
67 | struct mtd_partition *parts; | 67 | struct mtd_partition *parts; |
68 | int nb_parts = 0; | 68 | int nb_parts = 0; |
69 | int parsed_nr_parts = 0; | 69 | int parsed_nr_parts = 0; |
70 | const char *part_type; | 70 | const char *part_type; |
71 | 71 | ||
72 | /* | 72 | /* |
73 | * Static partition definition selection | 73 | * Static partition definition selection |
74 | */ | 74 | */ |
@@ -89,7 +89,7 @@ static int __init init_flash (void) | |||
89 | flash_mtd = do_map_probe("jedec_probe", &omap_toto_map_flash); | 89 | flash_mtd = do_map_probe("jedec_probe", &omap_toto_map_flash); |
90 | if (!flash_mtd) | 90 | if (!flash_mtd) |
91 | return -ENXIO; | 91 | return -ENXIO; |
92 | 92 | ||
93 | if (parsed_nr_parts > 0) { | 93 | if (parsed_nr_parts > 0) { |
94 | parts = parsed_parts; | 94 | parts = parsed_parts; |
95 | nb_parts = parsed_nr_parts; | 95 | nb_parts = parsed_nr_parts; |
@@ -108,8 +108,8 @@ static int __init init_flash (void) | |||
108 | } | 108 | } |
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
112 | int __init omap_toto_mtd_init(void) | 112 | int __init omap_toto_mtd_init(void) |
113 | { | 113 | { |
114 | int status; | 114 | int status; |
115 | 115 | ||
@@ -119,13 +119,12 @@ int __init omap_toto_mtd_init(void) | |||
119 | return status; | 119 | return status; |
120 | } | 120 | } |
121 | 121 | ||
122 | static void __exit omap_toto_mtd_cleanup(void) | 122 | static void __exit omap_toto_mtd_cleanup(void) |
123 | { | 123 | { |
124 | if (flash_mtd) { | 124 | if (flash_mtd) { |
125 | del_mtd_partitions(flash_mtd); | 125 | del_mtd_partitions(flash_mtd); |
126 | map_destroy(flash_mtd); | 126 | map_destroy(flash_mtd); |
127 | if (parsed_parts) | 127 | kfree(parsed_parts); |
128 | kfree(parsed_parts); | ||
129 | } | 128 | } |
130 | } | 129 | } |
131 | 130 | ||