From 2b60c49f3ca0648c5b02b60dc0f5b9e2c274bfb5 Mon Sep 17 00:00:00 2001
From: Lukas Wunner <lukas@wunner.de>
Date: Mon, 4 May 2020 13:12:01 +0200
Subject: [PATCH] spi: amd: Fix duplicate iounmap in error path
References: jsc#SLE-15356
Git-commit: 2b60c49f3ca0648c5b02b60dc0f5b9e2c274bfb5
Patch-mainline: v5.8-rc1
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/spi/spi-amd.c | 4 +---
1 file changed, 1 insertion(+), 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);
--
2.16.4