mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.102,1.103
thockin at infradead.org
thockin at infradead.org
Mon Sep 23 14:25:54 EDT 2002
Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv2786/chips
Modified Files:
cfi_cmdset_0001.c
Log Message:
fix indent snafu in cfi_cmdset_0001.c
remove extraneous MOD_INC_USE_COUNT in cfi_cmdset_0001.c
add maps/scb2_flash.c for Intel SCB2 motherboards' flash BIOS
-- OK'ed by dwmw2
Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- cfi_cmdset_0001.c 13 Sep 2002 14:39:34 -0000 1.102
+++ cfi_cmdset_0001.c 23 Sep 2002 18:25:51 -0000 1.103
@@ -180,7 +180,6 @@
}
map->fldrv = &cfi_intelext_chipdrv;
- MOD_INC_USE_COUNT;
/* Make sure it's in read mode */
cfi_send_gen_cmd(0xff, 0x55, base, map, cfi, cfi->device_type, NULL);
@@ -232,25 +231,25 @@
mtd->eraseregions[(j*cfi->cfiq->NumEraseRegions)+i].numblocks = ernum;
}
offset += (ersize * ernum);
- }
+ }
- if (offset != devsize) {
- /* Argh */
- printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize);
- kfree(mtd->eraseregions);
- kfree(cfi->cmdset_priv);
- return NULL;
- }
+ if (offset != devsize) {
+ /* Argh */
+ printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize);
+ kfree(mtd->eraseregions);
+ kfree(cfi->cmdset_priv);
+ return NULL;
+ }
- for (i=0; i<mtd->numeraseregions;i++){
- printk(KERN_DEBUG "%d: offset=0x%x,size=0x%x,blocks=%d\n",
- i,mtd->eraseregions[i].offset,
- mtd->eraseregions[i].erasesize,
- mtd->eraseregions[i].numblocks);
- }
+ for (i=0; i<mtd->numeraseregions;i++){
+ printk(KERN_DEBUG "%d: offset=0x%x,size=0x%x,blocks=%d\n",
+ i,mtd->eraseregions[i].offset,
+ mtd->eraseregions[i].erasesize,
+ mtd->eraseregions[i].numblocks);
+ }
/* Also select the correct geometry setup too */
- mtd->erase = cfi_intelext_erase_varsize;
+ mtd->erase = cfi_intelext_erase_varsize;
mtd->read = cfi_intelext_read;
if(map->point && map->unpoint){
More information about the linux-mtd-cvs
mailing list