---

yaml --- r: 258803 b: refs/heads/master c: 17e86d3 h: refs/heads/master i: 258801: 8450588 258799: 7cda05b v: v3
git-mirror · Jul 20, 2011 · d664178 · d664178
1 parent b8dbc44
commit d664178
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b19952ad9e2c5f9b16b12a919558226ce6a5e0ea
+refs/heads/master: 17e86d3879d589fce4c457bfb9a2029f883fb2cb
diff --git a/trunk/arch/arm/plat-samsung/dev-nand.c b/trunk/arch/arm/plat-samsung/dev-nand.c
@@ -91,11 +91,10 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
 	 * time then there is little chance the system is going to run.
 	 */ 
 
-	npd = kmemdup(nand, sizeof(struct s3c2410_platform_nand), GFP_KERNEL);
-	if (!npd) {
-		printk(KERN_ERR "%s: failed copying platform data\n", __func__);
+	npd = s3c_set_platdata(nand, sizeof(struct s3c2410_platform_nand),
+				&s3c_device_nand);
+	if (!npd)
 		return;
-	}
 
 	/* now see if we need to copy any of the nand set data */
 
@@ -123,6 +122,4 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
 			to++;
 		}
 	}
-
-	s3c_device_nand.dev.platform_data = npd;
 }