diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
| commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
| tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spi-tegra20-slink.c | |
| parent | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (diff) | |
| parent | ffa119f7c42d29be2dd759bb18cc4d1f45804c6b (diff) | |
| download | kernel_replicant_linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.gz kernel_replicant_linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.bz2 kernel_replicant_linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.zip | |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
| -rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index 111fffc91435..7f4d932dade7 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c @@ -599,8 +599,7 @@ static int tegra_slink_init_dma_param(struct tegra_slink_data *tspi, int ret; struct dma_slave_config dma_sconfig; - dma_chan = dma_request_slave_channel_reason(tspi->dev, - dma_to_memory ? "rx" : "tx"); + dma_chan = dma_request_chan(tspi->dev, dma_to_memory ? "rx" : "tx"); if (IS_ERR(dma_chan)) { ret = PTR_ERR(dma_chan); if (ret != -EPROBE_DEFER) @@ -1073,7 +1072,7 @@ static int tegra_slink_probe(struct platform_device *pdev) ret = clk_enable(tspi->clk); if (ret < 0) { dev_err(&pdev->dev, "Clock enable failed %d\n", ret); - goto exit_free_master; + goto exit_clk_unprepare; } spi_irq = platform_get_irq(pdev, 0); @@ -1146,6 +1145,8 @@ exit_free_irq: free_irq(spi_irq, tspi); exit_clk_disable: clk_disable(tspi->clk); +exit_clk_unprepare: + clk_unprepare(tspi->clk); exit_free_master: spi_master_put(master); return ret; @@ -1159,6 +1160,7 @@ static int tegra_slink_remove(struct platform_device *pdev) free_irq(tspi->irq, tspi); clk_disable(tspi->clk); + clk_unprepare(tspi->clk); if (tspi->tx_dma_chan) tegra_slink_deinit_dma_param(tspi, false); |