From 78aac82e3027d8b4b96b2e7dcb07990c973cad48 Mon Sep 17 00:00:00 2001
From: George Shore <george@georgeshore.com>
Date: Thu, 21 Jan 2010 11:40:48 +0000
Subject: [PATCH] --- yaml --- r: 180894 b: refs/heads/master c:
 83fe518a839e317480e50a138ef4acd73510d7ce h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/spi/dw_spi.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0cf19ef97ebf..7504c9a6482d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c587b6fa05106606053fc5e8e344f07cd34ace23
+refs/heads/master: 83fe518a839e317480e50a138ef4acd73510d7ce
diff --git a/trunk/include/linux/spi/dw_spi.h b/trunk/include/linux/spi/dw_spi.h
index 1a127a31e017..cc813f95a2f2 100644
--- a/trunk/include/linux/spi/dw_spi.h
+++ b/trunk/include/linux/spi/dw_spi.h
@@ -172,6 +172,10 @@ static inline void spi_chip_sel(struct dw_spi *dws, u16 cs)
 {
 	if (cs > dws->num_cs)
 		return;
+
+	if (dws->cs_control)
+		dws->cs_control(1);
+
 	dw_writel(dws, ser, 1 << cs);
 }