From: Mark Brown Date: Wed, 28 Oct 2020 21:36:51 +0000 (+0000) Subject: Merge tag 'v5.10-rc1' into spi-5.10 X-Git-Tag: v5.10.7~1093^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bfd5f422f07a10f485c3f046431783c7c4004f2;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'v5.10-rc1' into spi-5.10 Linux 5.10-rc1 --- 3bfd5f422f07a10f485c3f046431783c7c4004f2 diff --cc drivers/spi/spi-imx.c index 95be1b2,060b1f5..4b80e27 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@@ -1720,14 -1717,13 +1720,17 @@@ static int spi_imx_probe(struct platfor return ret; + out_bitbang_start: + if (spi_imx->devtype_data->has_dmamode) + spi_imx_sdma_exit(spi_imx); out_runtime_pm_put: pm_runtime_dont_use_autosuspend(spi_imx->dev); - pm_runtime_put_sync(spi_imx->dev); + pm_runtime_set_suspended(&pdev->dev); pm_runtime_disable(spi_imx->dev); + + clk_disable_unprepare(spi_imx->clk_ipg); +out_put_per: + clk_disable_unprepare(spi_imx->clk_per); out_master_put: spi_master_put(master);