diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-06 12:56:57 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-06 12:56:57 +1000 |
| commit | 80b5e812077ec598f5bfad37adac4f149de12c56 (patch) | |
| tree | 6efc3e3ffbd4f9c90422bbb7460c2ed5a6eaa867 /drivers/staging/spectra | |
| parent | 38ddfd31e6b5b57a3bd731813d52626ec2d58c77 (diff) | |
| parent | d5ed54322e54d48e5fa66dff0086b79211f1cde7 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
Diffstat (limited to 'drivers/staging/spectra')
| -rw-r--r-- | drivers/staging/spectra/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/spectra/flash.h | 2 | ||||
| -rw-r--r-- | drivers/staging/spectra/lld_nand.c | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/spectra/Kconfig b/drivers/staging/spectra/Kconfig index d231ae27299d..4fc206484830 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.h b/drivers/staging/spectra/flash.h index 5ed05805cf65..e59cf4ede551 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_nand.c b/drivers/staging/spectra/lld_nand.c index 13c3ad2db394..0d647a8fd2b6 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; } |