From 1583e84c9153592422d204449c5d80509a47fbfb Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 18 Jun 2012 11:27:04 +0100
Subject: [PATCH] --- yaml --- r: 311103 b: refs/heads/master c:
 10aa5a35e34fb00a2dd814447199f08756eb307b h: refs/heads/master i:   311101:
 eeed64dfcc6cbe7b74f89cc13063eccaf46196ec   311099:
 4ec38c5a2350cab0bc21cfdb346059b4474e0122   311095:
 99954fa53cab5c90f12fca8d3d562f7a1bacbef7   311087:
 e62893970bd80b81eac0f719223d57bd6cd3c18f   311071:
 47678f39d3bc71a40265cee3471e24f51d416b02   311039:
 b07b455a7daefbe4ccd65121fdc4dd36bf70435b v: v3

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

diff --git a/[refs] b/[refs]
index 14a9801e0ce7..35f6eafb38d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2805b9ab7c836cfbe01e86129983e36205078cb2
+refs/heads/master: 10aa5a35e34fb00a2dd814447199f08756eb307b
diff --git a/trunk/drivers/spi/spi-omap2-mcspi.c b/trunk/drivers/spi/spi-omap2-mcspi.c
index 46ef5fe51db5..0c73dd4f43a0 100644
--- a/trunk/drivers/spi/spi-omap2-mcspi.c
+++ b/trunk/drivers/spi/spi-omap2-mcspi.c
@@ -801,7 +801,7 @@ static int omap2_mcspi_setup(struct spi_device *spi)
 	mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
 	if (!cs) {
-		cs = devm_kzalloc(&spi->dev , sizeof *cs, GFP_KERNEL);
+		cs = kzalloc(sizeof *cs, GFP_KERNEL);
 		if (!cs)
 			return -ENOMEM;
 		cs->base = mcspi->base + spi->chip_select * 0x14;
@@ -842,6 +842,7 @@ static void omap2_mcspi_cleanup(struct spi_device *spi)
 		cs = spi->controller_state;
 		list_del(&cs->node);
 
+		kfree(cs);
 	}
 
 	if (spi->chip_select < spi->master->num_chipselect) {