diff options
Diffstat (limited to 'drivers/staging/spectra')
-rw-r--r-- | drivers/staging/spectra/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/spectra/flash.c | 2 | ||||
-rw-r--r-- | drivers/staging/spectra/flash.h | 2 | ||||
-rw-r--r-- | drivers/staging/spectra/lld_emu.c | 10 | ||||
-rw-r--r-- | drivers/staging/spectra/lld_mtd.c | 8 | ||||
-rw-r--r-- | drivers/staging/spectra/lld_nand.c | 7 |
6 files changed, 14 insertions, 17 deletions
diff --git a/drivers/staging/spectra/Kconfig b/drivers/staging/spectra/Kconfig index d231ae2..4fc2064 100644 --- a/drivers/staging/spectra/Kconfig +++ b/drivers/staging/spectra/Kconfig @@ -6,7 +6,7 @@ menuconfig SPECTRA default n ---help--- Enable the FTL pseudo-filesystem used with the NAND Flash - controller on Intel Moorestown Platform to pretend to be a disk + controller on Intel Moorestown Platform to pretend to be a disk. choice prompt "Compile for" diff --git a/drivers/staging/spectra/flash.c b/drivers/staging/spectra/flash.c index 9b5218b..4e6e451 100644 --- a/drivers/staging/spectra/flash.c +++ b/drivers/staging/spectra/flash.c @@ -1604,7 +1604,7 @@ static int get_l2_cache_blks(void) for (n = 0; n < BLK_NUM_FOR_L2_CACHE; n++) { blk = find_least_worn_blk_for_l2_cache(); - if (blk > DeviceInfo.wDataBlockNum) { + if (blk >= DeviceInfo.wDataBlockNum) { nand_dbg_print(NAND_DBG_WARN, "find_least_worn_blk_for_l2_cache: " "No enough free NAND blocks (n: %d) for L2 Cache!\n", n); diff --git a/drivers/staging/spectra/flash.h b/drivers/staging/spectra/flash.h index 5ed0580..e59cf4e 100644 --- a/drivers/staging/spectra/flash.h +++ b/drivers/staging/spectra/flash.h @@ -104,7 +104,7 @@ struct flash_cache_tag { }; /* - *Data structure for each list node of the managment table + *Data structure for each list node of the management table * used for the Level 2 Cache. Each node maps one logical NAND block. */ struct spectra_l2_cache_list { diff --git a/drivers/staging/spectra/lld_emu.c b/drivers/staging/spectra/lld_emu.c index 60eb0f6..6733bbf 100644 --- a/drivers/staging/spectra/lld_emu.c +++ b/drivers/staging/spectra/lld_emu.c @@ -25,6 +25,10 @@ #include "lld.h" #if CMD_DMA #include "lld_cdma.h" +#if FLASH_EMU +u32 totalUsedBanks; +u32 valid_banks[MAX_CHANS]; +#endif #endif #define GLOB_LLD_PAGES 64 @@ -32,12 +36,6 @@ #define GLOB_LLD_PAGE_DATA_SIZE 512 #define GLOB_LLD_BLOCKS 2048 -#if (CMD_DMA && FLASH_EMU) -#include "lld_cdma.h" -u32 totalUsedBanks; -u32 valid_banks[MAX_CHANS]; -#endif - #if FLASH_EMU /* This is for entire module */ static u8 *flash_memory[GLOB_LLD_BLOCKS * GLOB_LLD_PAGES]; diff --git a/drivers/staging/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c index 0de05b1..2bd3466 100644 --- a/drivers/staging/spectra/lld_mtd.c +++ b/drivers/staging/spectra/lld_mtd.c @@ -26,6 +26,8 @@ #include "lld.h" #if CMD_DMA #include "lld_cdma.h" +u32 totalUsedBanks; +u32 valid_banks[MAX_CHANS]; #endif #define GLOB_LLD_PAGES 64 @@ -33,12 +35,6 @@ #define GLOB_LLD_PAGE_DATA_SIZE 512 #define GLOB_LLD_BLOCKS 2048 -#if CMD_DMA -#include "lld_cdma.h" -u32 totalUsedBanks; -u32 valid_banks[MAX_CHANS]; -#endif - static struct mtd_info *spectra_mtd; static int mtddev = -1; module_param(mtddev, int, 0); diff --git a/drivers/staging/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c index 13c3ad2..0d647a8f 100644 --- a/drivers/staging/spectra/lld_nand.c +++ b/drivers/staging/spectra/lld_nand.c @@ -2411,13 +2411,15 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) csr_base = pci_resource_start(dev, 0); if (!csr_base) { printk(KERN_ERR "Spectra: pci_resource_start failed!\n"); - return -ENODEV; + ret = -ENODEV; + goto failed_req_csr; } csr_len = pci_resource_len(dev, 0); if (!csr_len) { printk(KERN_ERR "Spectra: pci_resource_len failed!\n"); - return -ENODEV; + ret = -ENODEV; + goto failed_req_csr; } ret = pci_request_regions(dev, SPECTRA_NAND_NAME); @@ -2464,6 +2466,7 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) failed_remap_csr: pci_release_regions(dev); failed_req_csr: + pci_disable_device(dev); return ret; } |