diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/mtd/maps/iq80310.c | |
parent | Remove amdtp, cmp drivers. (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.zip |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mtd/maps/iq80310.c')
-rw-r--r-- | drivers/mtd/maps/iq80310.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/mtd/maps/iq80310.c b/drivers/mtd/maps/iq80310.c index 558d014e7acc..62d9e87d84e2 100644 --- a/drivers/mtd/maps/iq80310.c +++ b/drivers/mtd/maps/iq80310.c @@ -1,11 +1,11 @@ /* - * $Id: iq80310.c,v 1.20 2004/11/04 13:24:15 gleixner Exp $ + * $Id: iq80310.c,v 1.21 2005/11/07 11:14:27 gleixner Exp $ * * Mapping for the Intel XScale IQ80310 evaluation board * * Author: Nicolas Pitre * Copyright: (C) 2001 MontaVista Software Inc. - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -103,8 +103,7 @@ static void __exit cleanup_iq80310(void) if (mymtd) { del_mtd_partitions(mymtd); map_destroy(mymtd); - if (parsed_parts) - kfree(parsed_parts); + kfree(parsed_parts); } if (iq80310_map.virt) iounmap((void *)iq80310_map.virt); |