From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Sun, 2 May 2021 09:34:34 +0000 (+0200)
Subject: can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path
X-Git-Tag: v5.12.5~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb40b2f5144742669a32ccf9a7498256d0420a65;p=thirdparty%2Fkernel%2Fstable.git

can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path

[ Upstream commit 4376ea42db8bfcac2bc3a30bba93917244a8c2d4 ]

This patch adds the missing can_rx_offload_del(), that must be called
if mcp251xfd_register() fails.

Fixes: 55e5b97f003e ("can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN")
Link: https://lore.kernel.org/r/20210504091838.1109047-1-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index 15b04db6ed9c5..4a742aa5c417b 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -2957,10 +2957,12 @@ static int mcp251xfd_probe(struct spi_device *spi)
 
 	err = mcp251xfd_register(priv);
 	if (err)
-		goto out_free_candev;
+		goto out_can_rx_offload_del;
 
 	return 0;
 
+ out_can_rx_offload_del:
+	can_rx_offload_del(&priv->offload);
  out_free_candev:
 	spi->max_speed_hz = priv->spi_max_speed_hz_orig;