diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /drivers/mtd/nand | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/cs553x_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c index e0a1d386e581..94924d52a9b9 100644 --- a/drivers/mtd/nand/cs553x_nand.c +++ b/drivers/mtd/nand/cs553x_nand.c | |||
| @@ -249,7 +249,7 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr) | |||
| 249 | goto out; | 249 | goto out; |
| 250 | 250 | ||
| 251 | out_ior: | 251 | out_ior: |
| 252 | iounmap((void *)this->IO_ADDR_R); | 252 | iounmap(this->IO_ADDR_R); |
| 253 | out_mtd: | 253 | out_mtd: |
| 254 | kfree(new_mtd); | 254 | kfree(new_mtd); |
| 255 | out: | 255 | out: |