diff options
Diffstat (limited to 'drivers/mtd/maps/lubbock-flash.c')
-rw-r--r-- | drivers/mtd/maps/lubbock-flash.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c index 2337e0c46750..1aa0447c5e66 100644 --- a/drivers/mtd/maps/lubbock-flash.c +++ b/drivers/mtd/maps/lubbock-flash.c | |||
@@ -1,11 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: lubbock-flash.c,v 1.19 2004/11/04 13:24:15 gleixner Exp $ | 2 | * $Id: lubbock-flash.c,v 1.21 2005/11/07 11:14:27 gleixner Exp $ |
3 | * | 3 | * |
4 | * Map driver for the Lubbock developer platform. | 4 | * Map driver for the Lubbock developer platform. |
5 | * | 5 | * |
6 | * Author: Nicolas Pitre | 6 | * Author: Nicolas Pitre |
7 | * Copyright: (C) 2001 MontaVista Software Inc. | 7 | * Copyright: (C) 2001 MontaVista Software Inc. |
8 | * | 8 | * |
9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
10 | * it under the terms of the GNU General Public License version 2 as | 10 | * it under the terms of the GNU General Public License version 2 as |
11 | * published by the Free Software Foundation. | 11 | * published by the Free Software Foundation. |
@@ -76,7 +76,7 @@ static int __init init_lubbock(void) | |||
76 | int flashboot = (LUB_CONF_SWITCHES & 1); | 76 | int flashboot = (LUB_CONF_SWITCHES & 1); |
77 | int ret = 0, i; | 77 | int ret = 0, i; |
78 | 78 | ||
79 | lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth = | 79 | lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth = |
80 | (BOOT_DEF & 1) ? 2 : 4; | 80 | (BOOT_DEF & 1) ? 2 : 4; |
81 | 81 | ||
82 | /* Compensate for the nROMBT switch which swaps the flash banks */ | 82 | /* Compensate for the nROMBT switch which swaps the flash banks */ |
@@ -100,11 +100,11 @@ static int __init init_lubbock(void) | |||
100 | simple_map_init(&lubbock_maps[i]); | 100 | simple_map_init(&lubbock_maps[i]); |
101 | 101 | ||
102 | printk(KERN_NOTICE "Probing %s at physical address 0x%08lx (%d-bit bankwidth)\n", | 102 | printk(KERN_NOTICE "Probing %s at physical address 0x%08lx (%d-bit bankwidth)\n", |
103 | lubbock_maps[i].name, lubbock_maps[i].phys, | 103 | lubbock_maps[i].name, lubbock_maps[i].phys, |
104 | lubbock_maps[i].bankwidth * 8); | 104 | lubbock_maps[i].bankwidth * 8); |
105 | 105 | ||
106 | mymtds[i] = do_map_probe("cfi_probe", &lubbock_maps[i]); | 106 | mymtds[i] = do_map_probe("cfi_probe", &lubbock_maps[i]); |
107 | 107 | ||
108 | if (!mymtds[i]) { | 108 | if (!mymtds[i]) { |
109 | iounmap((void *)lubbock_maps[i].virt); | 109 | iounmap((void *)lubbock_maps[i].virt); |
110 | if (lubbock_maps[i].cached) | 110 | if (lubbock_maps[i].cached) |
@@ -124,7 +124,7 @@ static int __init init_lubbock(void) | |||
124 | 124 | ||
125 | if (!mymtds[0] && !mymtds[1]) | 125 | if (!mymtds[0] && !mymtds[1]) |
126 | return ret; | 126 | return ret; |
127 | 127 | ||
128 | for (i = 0; i < 2; i++) { | 128 | for (i = 0; i < 2; i++) { |
129 | if (!mymtds[i]) { | 129 | if (!mymtds[i]) { |
130 | printk(KERN_WARNING "%s is absent. Skipping\n", lubbock_maps[i].name); | 130 | printk(KERN_WARNING "%s is absent. Skipping\n", lubbock_maps[i].name); |
@@ -151,15 +151,14 @@ static void __exit cleanup_lubbock(void) | |||
151 | if (nr_parsed_parts[i] || !i) | 151 | if (nr_parsed_parts[i] || !i) |
152 | del_mtd_partitions(mymtds[i]); | 152 | del_mtd_partitions(mymtds[i]); |
153 | else | 153 | else |
154 | del_mtd_device(mymtds[i]); | 154 | del_mtd_device(mymtds[i]); |
155 | 155 | ||
156 | map_destroy(mymtds[i]); | 156 | map_destroy(mymtds[i]); |
157 | iounmap((void *)lubbock_maps[i].virt); | 157 | iounmap((void *)lubbock_maps[i].virt); |
158 | if (lubbock_maps[i].cached) | 158 | if (lubbock_maps[i].cached) |
159 | iounmap(lubbock_maps[i].cached); | 159 | iounmap(lubbock_maps[i].cached); |
160 | 160 | ||
161 | if (parsed_parts[i]) | 161 | kfree(parsed_parts[i]); |
162 | kfree(parsed_parts[i]); | ||
163 | } | 162 | } |
164 | } | 163 | } |
165 | 164 | ||