diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-22 20:10:23 -0400 |
| commit | 28eb177dfa5982d132edceed891cb3885df258bb (patch) | |
| tree | 5f8fdc37ad1d8d0793e9c47da7d908b97c814ffb /drivers/mtd/nand/edb7312.c | |
| parent | fd8ae94eea9bb4269d6dff1b47b9dc741bd70d0b (diff) | |
| parent | db392219c5f572610645696e3672f6ea38783a65 (diff) | |
Merge branch 'master' into upstream
Conflicts:
net/ieee80211/ieee80211_crypt_tkip.c
net/ieee80211/ieee80211_crypt_wep.c
Diffstat (limited to 'drivers/mtd/nand/edb7312.c')
| -rw-r--r-- | drivers/mtd/nand/edb7312.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c index 516c0e5e564c..12017f3c6bd6 100644 --- a/drivers/mtd/nand/edb7312.c +++ b/drivers/mtd/nand/edb7312.c | |||
| @@ -198,6 +198,9 @@ static void __exit ep7312_cleanup(void) | |||
| 198 | /* Release resources, unregister device */ | 198 | /* Release resources, unregister device */ |
| 199 | nand_release(ap7312_mtd); | 199 | nand_release(ap7312_mtd); |
| 200 | 200 | ||
| 201 | /* Release io resource */ | ||
| 202 | iounmap((void *)this->IO_ADDR_R); | ||
| 203 | |||
| 201 | /* Free the MTD device structure */ | 204 | /* Free the MTD device structure */ |
| 202 | kfree(ep7312_mtd); | 205 | kfree(ep7312_mtd); |
| 203 | } | 206 | } |