summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorPan Bian <bianpan2016@163.com>2021-01-19 21:00:25 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 09:39:44 +0100
commit865432a6e63ca1a7ce858cc73963e1a9c675c446 (patch)
treece0306b2987b5f3f088eaa8f29b25439a62e9803 /drivers/spi
parent9cf7b6615f46bc66b0afa3eedd480b85be1a256d (diff)
downloadlinux-stable-865432a6e63ca1a7ce858cc73963e1a9c675c446.tar.gz
linux-stable-865432a6e63ca1a7ce858cc73963e1a9c675c446.tar.bz2
linux-stable-865432a6e63ca1a7ce858cc73963e1a9c675c446.zip
spi: atmel: Put allocated master before return
[ Upstream commit 21ea2743f015dbacec1831bdc8afc848db9c2b8c ] The allocated master is not released. Goto error handling label rather than directly return. Fixes: 5e9af37e46bc ("spi: atmel: introduce probe deferring") Signed-off-by: Pan Bian <bianpan2016@163.com> Fixes: 5e9af37e46bc ("spi: atmel: introduce probe deferring") Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Link: https://lore.kernel.org/r/20210120050025.25426-1-bianpan2016@163.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-atmel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 5a9d7e252a77..2254e36c7f46 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1605,7 +1605,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
if (ret == 0) {
as->use_dma = true;
} else if (ret == -EPROBE_DEFER) {
- return ret;
+ goto out_unmap_regs;
}
} else if (as->caps.has_pdc_support) {
as->use_pdc = true;