diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 13:53:06 +0200 |
| commit | 61eab000f3536f080eab43fd5eed3fd817ded76e (patch) | |
| tree | d1448b3b90c5650b522c8d13d8bdd7bd65a5cf52 /drivers/spi/spi-omap2-mcspi.c | |
| parent | 68e67f40b7343383517c3f951b4b8db7626406bc (diff) | |
| parent | 4e01ec636e64707d202a1ca21a47bbc6d53085b7 (diff) | |
Merge branch 'topic/hda' into for-next
This is a large chunk merge for 3.6 HD-audio things
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 46ef5fe51db5..0c73dd4f43a0 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/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) { |