Merge tag 'net-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / drivers / net / can / spi / mcp251xfd / mcp251xfd-core.c

diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index 970dc570e7a5b77044f5942524b5e6695dfbc4da..e0ae00e34c7bef8394f63dbda0dff25f18e8414e 100644 (file)
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -2885,8 +2885,8 @@ static int mcp251xfd_probe(struct spi_device *spi)
 
        clk = devm_clk_get(&spi->dev, NULL);
        if (IS_ERR(clk))
-               dev_err_probe(&spi->dev, PTR_ERR(clk),
-                             "Failed to get Oscillator (clock)!\n");
+               return dev_err_probe(&spi->dev, PTR_ERR(clk),
+                                    "Failed to get Oscillator (clock)!\n");
        freq = clk_get_rate(clk);
 
        /* Sanity check */
@@ -2986,10 +2986,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;