diff options
| author | Mark Brown <broonie@kernel.org> | 2021-04-15 20:29:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-04-15 20:29:40 +0200 |
| commit | c7ed5fd5fbb279a75a58cf641b873f57ef906ac7 (patch) | |
| tree | 4aac1ad717ce4a757b872463bbfd75f0a182a75e /drivers/spi/spi-stm32.c | |
| parent | spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe (diff) | |
| parent | spi: pxa2xx: Add support for Intel Alder Lake PCH-M (diff) | |
| download | linux-c7ed5fd5fbb279a75a58cf641b873f57ef906ac7.tar.xz linux-c7ed5fd5fbb279a75a58cf641b873f57ef906ac7.zip | |
Merge branch 'for-5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.13
Diffstat (limited to 'drivers/spi/spi-stm32.c')
| -rw-r--r-- | drivers/spi/spi-stm32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index aa2c5018ed53..8ffcffbb8157 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c @@ -1927,7 +1927,7 @@ static int stm32_spi_probe(struct platform_device *pdev) pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) { dev_err(&pdev->dev, "spi master registration failed: %d\n", ret); @@ -1956,6 +1956,7 @@ static int stm32_spi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct stm32_spi *spi = spi_master_get_devdata(master); + spi_unregister_master(master); spi->cfg->disable(spi); if (master->dma_tx) |