projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a3e09ef
)
can: mcp251x: mcp251x_can_probe(): add missing unregister_candev() in error path
author
Dongliang Mu
<dzm91@hust.edu.cn>
Mon, 24 Oct 2022 09:02:52 +0000
(17:02 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 3 Nov 2022 14:59:17 +0000
(23:59 +0900)
[ Upstream commit
b1a09b63684cea56774786ca14c13b7041ffee63
]
In mcp251x_can_probe(), if mcp251x_gpio_setup() fails, it forgets to
unregister the CAN device.
Fix this by unregistering can device in mcp251x_can_probe().
Fixes: 2d52dabbef60 ("can: mcp251x: add GPIO support")
Signed-off-by: Dongliang Mu <dzm91@hust.edu.cn>
Link:
https://lore.kernel.org/all/20221024090256.717236-1-dzm91@hust.edu.cn
[mkl: adjust label]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/spi/mcp251x.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/spi/mcp251x.c
b/drivers/net/can/spi/mcp251x.c
index baab3adc34bc6229ee8b78abc3d8bf22c4086692..f02275f71e4d93629dc4e060235eab3fa289cd0d 100644
(file)
--- a/
drivers/net/can/spi/mcp251x.c
+++ b/
drivers/net/can/spi/mcp251x.c
@@
-1419,11
+1419,14
@@
static int mcp251x_can_probe(struct spi_device *spi)
ret = mcp251x_gpio_setup(priv);
if (ret)
- goto
error_probe
;
+ goto
out_unregister_candev
;
netdev_info(net, "MCP%x successfully initialized.\n", priv->model);
return 0;
+out_unregister_candev:
+ unregister_candev(net);
+
error_probe:
destroy_workqueue(priv->wq);
priv->wq = NULL;