HID: usbhid: Fix flood of "control queue full" messages

[linux-2.6-microblaze.git] / drivers / spi / spi-ti-qspi.c

diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c
index 9417385..e06aafe 100644 (file)
--- a/drivers/spi/spi-ti-qspi.c
+++ b/drivers/spi/spi-ti-qspi.c
@@ -733,6 +733,17 @@ static int ti_qspi_runtime_resume(struct device *dev)
        return 0;
 }
 
+static void ti_qspi_dma_cleanup(struct ti_qspi *qspi)
+{
+       if (qspi->rx_bb_addr)
+               dma_free_coherent(qspi->dev, QSPI_DMA_BUFFER_SIZE,
+                                 qspi->rx_bb_addr,
+                                 qspi->rx_bb_dma_addr);
+
+       if (qspi->rx_chan)
+               dma_release_channel(qspi->rx_chan);
+}
+
 static const struct of_device_id ti_qspi_match[] = {
        {.compatible = "ti,dra7xxx-qspi" },
        {.compatible = "ti,am4372-qspi" },
@@ -886,6 +897,8 @@ no_dma:
        if (!ret)
                return 0;
 
+       ti_qspi_dma_cleanup(qspi);
+
        pm_runtime_disable(&pdev->dev);
 free_master:
        spi_master_put(master);
@@ -904,12 +917,7 @@ static int ti_qspi_remove(struct platform_device *pdev)
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
 
-       if (qspi->rx_bb_addr)
-               dma_free_coherent(qspi->dev, QSPI_DMA_BUFFER_SIZE,
-                                 qspi->rx_bb_addr,
-                                 qspi->rx_bb_dma_addr);
-       if (qspi->rx_chan)
-               dma_release_channel(qspi->rx_chan);
+       ti_qspi_dma_cleanup(qspi);
 
        return 0;
 }