Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / mtd / maps / physmap_of.c

diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index cf75a566442ed790e70ef062b755bf3581db7afc..aeed9ea79714ab56454840ee34d6eb5395e60f12 100644 (file)
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -232,7 +232,6 @@ static int __devinit of_flash_probe(struct of_device *dev,
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info)
                goto err_out;
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info)
                goto err_out;

-       memset(info, 0, sizeof(*info));

 
        dev_set_drvdata(&dev->dev, info);
 
 
        dev_set_drvdata(&dev->dev, info);