ASoC: stm32: spdifrx: fix control DMA error management
authorolivier moysan <olivier.moysan@st.com>
Mon, 6 Nov 2017 15:18:53 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 6 Nov 2017 15:45:45 +0000 (15:45 +0000)
Fix DMA channel request error handling.

Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/stm/stm32_spdifrx.c

index d7dbe84d5eeb84c97ae65542e4693b55a632dbf4..b9bdefcd3e104a7f138803200be77b51648c1802 100644 (file)
@@ -392,6 +392,12 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev,
 {
        int ret;
 
 {
        int ret;
 
+       spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl");
+       if (IS_ERR(spdifrx->ctrl_chan)) {
+               dev_err(dev, "dma_request_slave_channel failed\n");
+               return PTR_ERR(spdifrx->ctrl_chan);
+       }
+
        spdifrx->dmab = devm_kzalloc(dev, sizeof(struct snd_dma_buffer),
                                     GFP_KERNEL);
        if (!spdifrx->dmab)
        spdifrx->dmab = devm_kzalloc(dev, sizeof(struct snd_dma_buffer),
                                     GFP_KERNEL);
        if (!spdifrx->dmab)
@@ -406,12 +412,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev,
                return ret;
        }
 
                return ret;
        }
 
-       spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl");
-       if (!spdifrx->ctrl_chan) {
-               dev_err(dev, "dma_request_slave_channel failed\n");
-               return -EINVAL;
-       }
-
        spdifrx->slave_config.direction = DMA_DEV_TO_MEM;
        spdifrx->slave_config.src_addr = (dma_addr_t)(spdifrx->phys_addr +
                                         STM32_SPDIFRX_CSR);
        spdifrx->slave_config.direction = DMA_DEV_TO_MEM;
        spdifrx->slave_config.src_addr = (dma_addr_t)(spdifrx->phys_addr +
                                         STM32_SPDIFRX_CSR);
@@ -423,7 +423,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev,
                                     &spdifrx->slave_config);
        if (ret < 0) {
                dev_err(dev, "dmaengine_slave_config returned error %d\n", ret);
                                     &spdifrx->slave_config);
        if (ret < 0) {
                dev_err(dev, "dmaengine_slave_config returned error %d\n", ret);
-               dma_release_channel(spdifrx->ctrl_chan);
                spdifrx->ctrl_chan = NULL;
        }
 
                spdifrx->ctrl_chan = NULL;
        }
 
@@ -962,7 +961,7 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
        return 0;
 
 error:
        return 0;
 
 error:
-       if (spdifrx->ctrl_chan)
+       if (!IS_ERR(spdifrx->ctrl_chan))
                dma_release_channel(spdifrx->ctrl_chan);
        if (spdifrx->dmab)
                snd_dma_free_pages(spdifrx->dmab);
                dma_release_channel(spdifrx->ctrl_chan);
        if (spdifrx->dmab)
                snd_dma_free_pages(spdifrx->dmab);