aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/chips/cfi_cmdset_0020.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 423666b51efb..9a1a6ffd16b8 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -206,23 +206,23 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
206 mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].numblocks = ernum; 206 mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].numblocks = ernum;
207 } 207 }
208 offset += (ersize * ernum); 208 offset += (ersize * ernum);
209 } 209 }
210 210
211 if (offset != devsize) { 211 if (offset != devsize) {
212 /* Argh */ 212 /* Argh */
213 printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize); 213 printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize);
214 kfree(mtd->eraseregions); 214 kfree(mtd->eraseregions);
215 kfree(cfi->cmdset_priv); 215 kfree(cfi->cmdset_priv);
216 kfree(mtd); 216 kfree(mtd);
217 return NULL; 217 return NULL;
218 } 218 }
219 219
220 for (i=0; i<mtd->numeraseregions;i++){ 220 for (i=0; i<mtd->numeraseregions;i++){
221 printk(KERN_DEBUG "%d: offset=0x%llx,size=0x%x,blocks=%d\n", 221 printk(KERN_DEBUG "%d: offset=0x%llx,size=0x%x,blocks=%d\n",
222 i, (unsigned long long)mtd->eraseregions[i].offset, 222 i, (unsigned long long)mtd->eraseregions[i].offset,
223 mtd->eraseregions[i].erasesize, 223 mtd->eraseregions[i].erasesize,
224 mtd->eraseregions[i].numblocks); 224 mtd->eraseregions[i].numblocks);
225 } 225 }
226 226
227 /* Also select the correct geometry setup too */ 227 /* Also select the correct geometry setup too */
228 mtd->_erase = cfi_staa_erase_varsize; 228 mtd->_erase = cfi_staa_erase_varsize;