From b12f5c95a3ccbf518e8c08723634605c37a6bfba Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Wed, 23 Dec 2009 20:34:29 +0000
Subject: [PATCH] --- yaml --- r: 178755 b: refs/heads/master c:
 2b542a13a94f310e718f2ed57b0f712b9ddbbbef h: refs/heads/master i:   178753:
 8661528f6ac68da6d20a8c642293e7212482b20f   178751:
 e335c7e4007ec9373a2e032209960a355e0070ac v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/plat-s3c/dev-nand.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3486aa58b134..1770ab7ca3c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce8877b542d946ee4fb29b57dc9d6549648b1558
+refs/heads/master: 2b542a13a94f310e718f2ed57b0f712b9ddbbbef
diff --git a/trunk/arch/arm/plat-s3c/dev-nand.c b/trunk/arch/arm/plat-s3c/dev-nand.c
index e771e77dcd54..84808ccda70e 100644
--- a/trunk/arch/arm/plat-s3c/dev-nand.c
+++ b/trunk/arch/arm/plat-s3c/dev-nand.c
@@ -114,7 +114,7 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
 		
 		for (i = 0; i < npd->nr_sets; i++) {
 			ret = s3c_nand_copy_set(to);
-			if (!ret) {
+			if (ret) {
 				printk(KERN_ERR "%s: failed to copy set %d\n",
 				__func__, i);
 				return;
@@ -122,6 +122,8 @@ void __init s3c_nand_set_platdata(struct s3c2410_platform_nand *nand)
 			to++;
 		}
 	}
+
+	s3c_device_nand.dev.platform_data = npd;
 }
 
 EXPORT_SYMBOL_GPL(s3c_nand_set_platdata);