---

yaml --- r: 311103 b: refs/heads/master c: 10aa5a3 h: refs/heads/master i: 311101: eeed64d 311099: 4ec38c5 311095: 99954fa 311087: e628939 311071: 47678f3 311039: b07b455 v: v3
git-mirror · Jun 18, 2012 · 1583e84 · 1583e84
1 parent 0129ba3
commit 1583e84
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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) {