| From e4c409c96ec4ba64ff72984a0276cbc305ff2f83 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 19 Jan 2021 21:00:25 -0800 |
| Subject: spi: atmel: Put allocated master before return |
| |
| From: Pan Bian <bianpan2016@163.com> |
| |
| [ 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> |
| --- |
| drivers/spi/spi-atmel.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c |
| index 7b739c449227f..6c9ce7b24aa0c 100644 |
| --- a/drivers/spi/spi-atmel.c |
| +++ b/drivers/spi/spi-atmel.c |
| @@ -1582,7 +1582,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; |
| -- |
| 2.27.0 |
| |