summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-amd.c
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2020-05-04 13:12:01 +0200
committerMark Brown <broonie@kernel.org>2020-05-04 18:18:45 +0200
commit2b60c49f3ca0648c5b02b60dc0f5b9e2c274bfb5 (patch)
tree9b1c524182eda35bc27b2eec7ec596b1daa9a75a /drivers/spi/spi-amd.c
parentspi: atmel: Add missing annotation for atmel_spi_next_xfer_dma_submit() (diff)
downloadlinux-2b60c49f3ca0648c5b02b60dc0f5b9e2c274bfb5.tar.xz
linux-2b60c49f3ca0648c5b02b60dc0f5b9e2c274bfb5.zip
spi: amd: Fix duplicate iounmap in error path
The AMD SPI driver uses devm_ioremap_resource() to map its registers, so they're automatically unmapped via device_release() when the last ref on the SPI controller is dropped. The additional iounmap() in the ->probe() error path is thus unnecessary. Signed-off-by: Lukas Wunner <lukas@wunner.de> Link: https://lore.kernel.org/r/497cc38ae2beb7900ae05a1463eb83ff96e2770e.1588590210.git.lukas@wunner.de Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-amd.c')
-rw-r--r--drivers/spi/spi-amd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-amd.c b/drivers/spi/spi-amd.c
index c7cfc3dc20b1..65b53eee5be9 100644
--- a/drivers/spi/spi-amd.c
+++ b/drivers/spi/spi-amd.c
@@ -285,14 +285,12 @@ static int amd_spi_probe(struct platform_device *pdev)
err = spi_register_master(master);
if (err) {
dev_err(dev, "error %d registering SPI controller\n", err);
- goto err_iounmap;
+ goto err_free_master;
}
platform_set_drvdata(pdev, amd_spi);
return 0;
-err_iounmap:
- iounmap(amd_spi->io_remap_addr);
err_free_master:
spi_master_put(master);