---

yaml --- r: 195923 b: refs/heads/master c: 1ca5d2f h: refs/heads/master i: 195921: c58762d 195919: dc935e8 v: v3
git-mirror · Apr 20, 2010 · 20db30e · 20db30e
1 parent a038d07
commit 20db30e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fed457a83611182f5a2e049cce02f8f4e1b65644
+refs/heads/master: 1ca5d2f0196cfca678086fa6f88eec4f9d0307ee
diff --git a/trunk/drivers/mtd/maps/physmap.c b/trunk/drivers/mtd/maps/physmap.c
@@ -264,8 +264,11 @@ static int __init physmap_init(void)
 
 	err = platform_driver_register(&physmap_flash_driver);
 #ifdef CONFIG_MTD_PHYSMAP_COMPAT
-	if (err == 0)
-		platform_device_register(&physmap_flash);
+	if (err == 0) {
+		err = platform_device_register(&physmap_flash);
+		if (err)
+			platform_driver_unregister(&physmap_flash_driver);
+	}
 #endif
 
 	return err;