Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[karo-tx-linux.git] / drivers / mtd / maps / ixp4xx.c

diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 471553a3da69fa6f25edbf688fe9075b1addec1a..56b3a355bf7b83f934a77eeca368b2cdfa25d96c 100644 (file)
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -117,8 +117,7 @@ static int ixp4xx_flash_remove(struct device *_dev)
        if (info->map.virt)
                iounmap(info->map.virt);
 
-       if (info->partitions)
-               kfree(info->partitions);
+       kfree(info->partitions);
 
        if (info->res) {
                release_resource(info->res);