spi: dw-mid: check that DMA was inited before exit
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 12 Sep 2014 12:11:58 +0000 (15:11 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Oct 2014 16:35:10 +0000 (09:35 -0700)
commit fb57862ead652454ceeb659617404c5f13bc34b5 upstream.

If the driver was compiled with DMA support, but DMA channels weren't acquired
by some reason, mid_spi_dma_exit() will crash the kernel.

Fixes: 7063c0d942a1 (spi/dw_spi: add DMA support)
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spi/spi-dw-mid.c

index 58fa14d27ffadb29b6ffeac5743d68f283c6c125..b8ac40c8a22d26db5018020f3e1aca4365338085 100644 (file)
@@ -89,6 +89,8 @@ err_exit:
 
 static void mid_spi_dma_exit(struct dw_spi *dws)
 {
+       if (!dws->dma_inited)
+               return;
        dma_release_channel(dws->txchan);
        dma_release_channel(dws->rxchan);
 }