| From 2bfb154f246763a239073d2c16d0773ba229898f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 2 May 2021 11:34:34 +0200 |
| Subject: can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() |
| in error path |
| |
| From: Marc Kleine-Budde <mkl@pengutronix.de> |
| |
| [ 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> |
| --- |
| drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c |
| index 096d818c167e..68ff931993c2 100644 |
| --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c |
| +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c |
| @@ -2870,10 +2870,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; |
| |
| -- |
| 2.30.2 |
| |