From 2562fd9f9579fa9d467d63edc1a588fa4d7698d1 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 4 Aug 2012 11:18:20 +0000
Subject: [PATCH] --- yaml --- r: 321536 b: refs/heads/master c:
 4732cc636075ff1a0219bf933d8c23d1a99f41ed h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5238eff50dd6..4563968e3ab5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d680e2c11eb0ddd21ba438b3a537e2eb093ff86f
+refs/heads/master: 4732cc636075ff1a0219bf933d8c23d1a99f41ed
diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c
index 646a7657fe62..cfa2c35dfeed 100644
--- a/trunk/drivers/spi/spi-s3c64xx.c
+++ b/trunk/drivers/spi/spi-s3c64xx.c
@@ -826,7 +826,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
 				struct spi_device *spi)
 {
 	struct s3c64xx_spi_csinfo *cs;
-	struct device_node *slave_np, *data_np;
+	struct device_node *slave_np, *data_np = NULL;
 	u32 fb_delay = 0;
 
 	slave_np = spi->dev.of_node;