[PATCH] spi: spi-at91-usart: Fix wrong goto jump label when spi_alloc_master() returns error.

zpershuai zpershuai at gmail.com
Tue Jun 8 08:14:07 PDT 2021


When spi_alloc_master() returns null pointer, it’s no need to use
spi_master_put() to release the memory, although spi_master_put()
function has null pointer checks.

Signed-off-by: zpershuai <zpershuai at gmail.com>
---
 drivers/spi/spi-at91-usart.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-at91-usart.c b/drivers/spi/spi-at91-usart.c
index 8c83526..c8136dc 100644
--- a/drivers/spi/spi-at91-usart.c
+++ b/drivers/spi/spi-at91-usart.c
@@ -533,8 +533,10 @@ static int at91_usart_spi_probe(struct platform_device *pdev)
 
 	ret = -ENOMEM;
 	controller = spi_alloc_master(&pdev->dev, sizeof(*aus));
-	if (!controller)
-		goto at91_usart_spi_probe_fail;
+	if (!controller) {
+		dev_err(&pdev->dev, "Error allocating SPI controller\n");
+		return -ENOMEM;
+	}
 
 	ret = at91_usart_gpio_setup(pdev);
 	if (ret)
-- 
2.7.4




More information about the linux-arm-kernel mailing list