From 4790eedc8bedfb21ce7ca8898fd525e661c1f43b Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Thu, 13 Sep 2012 16:31:30 +0200
Subject: [PATCH] --- yaml --- r: 328609 b: refs/heads/master c:
 5bee3b94d945851d6cb624a5e6808d9a815ebca0 h: refs/heads/master i:   328607:
 df58c5fd45c06f53b5048980c6bc51bb3db7ff32 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi-s3c64xx.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 368455dfa5b6..5ee5f91f826e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec155afa82cb10d97b6c10d6ede5b0ffa321e816
+refs/heads/master: 5bee3b94d945851d6cb624a5e6808d9a815ebca0
diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c
index 0087139090e4..c6ad4e1c3dc0 100644
--- a/trunk/drivers/spi/spi-s3c64xx.c
+++ b/trunk/drivers/spi/spi-s3c64xx.c
@@ -976,7 +976,8 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
 	spi_set_ctldata(spi, NULL);
 
 err_gpio_req:
-	kfree(cs);
+	if (spi->dev.of_node)
+		kfree(cs);
 
 	return err;
 }