diff --git a/[refs] b/[refs]
index 819dcf6164f4..1f9edc9170d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0b8ba7bfe7b4c1f11b3356b65520405b005bd33
+refs/heads/master: 8f0f23f97adbd833000e25e41c1310e49ace9ba8
diff --git a/trunk/drivers/mtd/maps/physmap_of.c b/trunk/drivers/mtd/maps/physmap_of.c
index bbb42c35b69b..fbd613968717 100644
--- a/trunk/drivers/mtd/maps/physmap_of.c
+++ b/trunk/drivers/mtd/maps/physmap_of.c
@@ -141,7 +141,6 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
 		err = -ENOMEM;
 		goto err_out;
 	}
-	memset(info, 0, sizeof(*info));
 
 	dev_set_drvdata(&dev->dev, info);
 
@@ -213,10 +212,6 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
 err_out:
 	of_physmap_remove(dev);
 	return err;
-
-	return 0;
-
-
 }
 
 static struct of_device_id of_physmap_match[] = {