| Date: | 2010-07-30 04:12:16 (13 years 4 months ago) |
|---|---|
| Author: | Maarten ter Huurne |
| Commit: | 9c5557e38c87b7a902a4a1532a59cd7ce029510e |
| Message: | MTD: NAND: jz4740: Fix remove function. Used banks do not have to be consecutive, so if a bank is empty skip it instead of stopping the unmapping. Free the NAND busy sense GPIO. |
| Files: |
drivers/mtd/nand/jz4740_nand.c (2 diffs) |
Change Details
| drivers/mtd/nand/jz4740_nand.c | ||
|---|---|---|
| 565 | 565 | static int __devexit jz_nand_remove(struct platform_device *pdev) |
| 566 | 566 | { |
| 567 | 567 | struct jz_nand *nand = platform_get_drvdata(pdev); |
| 568 | struct jz_nand_platform_data *pdata = pdev->dev.platform_data; | |
| 568 | 569 | int i; |
| 569 | 570 | |
| 570 | 571 | nand_release(&nand->mtd); |
| ... | ... | |
| 572 | 573 | /* Deassert and disable all chips */ |
| 573 | 574 | writel(0, nand->base + JZ_REG_NAND_CTRL); |
| 574 | 575 | |
| 575 | i = 0; | |
| 576 | do { | |
| 577 | jz_nand_iounmap_resource(nand->bank_mem[i], nand->bank_base[i]); | |
| 578 | ++i; | |
| 579 | } while (nand->bank_base[i] != 0 && i < 4); | |
| 576 | for (i = 0; i < 4; ++i) | |
| 577 | if (nand->bank_base[i] != 0) | |
| 578 | jz_nand_iounmap_resource(nand->bank_mem[i], | |
| 579 | nand->bank_base[i]); | |
| 580 | gpio_free(pdata->busy_gpio); | |
| 580 | 581 | |
| 581 | 582 | jz_nand_iounmap_resource(nand->mem, nand->base); |
| 582 | 583 | |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
