mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

can: mcp251x: fix resume from sleep before interface was brought up

Browse source 
Since 8ce8c0abcb the driver queues work via priv->restart_work when
resuming after suspend, even when the interface was not previously
enabled. This causes a null dereference error as the workqueue is only
allocated and initialized in mcp251x_open().

To fix this we move the workqueue init to mcp251x_can_probe() as there
is no reason to do it later and repeat it whenever mcp251x_open() is
called.

Fixes: 8ce8c0abcb ("can: mcp251x: only reset hardware as required")
Link: https://lore.kernel.org/r/17d5d714-b468-482f-f37a-482e3d6df84e@kontron.de
Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
[mkl: fix error handling in mcp251x_stop()]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Frieder Schrempf 2021-05-05 09:14:15 +02:00 committed by Marc Kleine-Budde
parent 4376ea42db
commit 03c427147b
1 changed files with 18 additions and 17 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/net/can/spi/mcp251x.c
View file

@ -956,8 +956,6 @@ static int mcp251x_stop(struct net_device *net)
priv->force_quit = 1; priv->force_quit = 1;
free_irq(spi->irq, priv); free_irq(spi->irq, priv);
destroy_workqueue(priv->wq);
priv->wq = NULL;
mutex_lock(&priv->mcp_lock); mutex_lock(&priv->mcp_lock);
@ -1224,24 +1222,15 @@ static int mcp251x_open(struct net_device *net)
goto out_close; goto out_close;
} }
priv->wq = alloc_workqueue("mcp251x_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,
0);
if (!priv->wq) {
ret = -ENOMEM;
goto out_clean;
}
INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
ret = mcp251x_hw_wake(spi); ret = mcp251x_hw_wake(spi);
if (ret) if (ret)
goto out_free_wq; goto out_free_irq;
ret = mcp251x_setup(net, spi); ret = mcp251x_setup(net, spi);
if (ret) if (ret)
goto out_free_wq; goto out_free_irq;
ret = mcp251x_set_normal_mode(spi); ret = mcp251x_set_normal_mode(spi);
if (ret) if (ret)
goto out_free_wq; goto out_free_irq;
can_led_event(net, CAN_LED_EVENT_OPEN); can_led_event(net, CAN_LED_EVENT_OPEN);
@ -1250,9 +1239,7 @@ static int mcp251x_open(struct net_device *net)
return 0; return 0;
out_free_wq: out_free_irq:
destroy_workqueue(priv->wq);
out_clean:
free_irq(spi->irq, priv); free_irq(spi->irq, priv);
mcp251x_hw_sleep(spi); mcp251x_hw_sleep(spi);
out_close: out_close:
@ -1373,6 +1360,15 @@ static int mcp251x_can_probe(struct spi_device *spi)
if (ret) if (ret)
goto out_clk; goto out_clk;
priv->wq = alloc_workqueue("mcp251x_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,
0);
if (!priv->wq) {
ret = -ENOMEM;
goto out_clk;
}
INIT_WORK(&priv->tx_work, mcp251x_tx_work_handler);
INIT_WORK(&priv->restart_work, mcp251x_restart_work_handler);
priv->spi = spi; priv->spi = spi;
mutex_init(&priv->mcp_lock); mutex_init(&priv->mcp_lock);
@ -1417,6 +1413,8 @@ static int mcp251x_can_probe(struct spi_device *spi)
return 0; return 0;
error_probe: error_probe:
destroy_workqueue(priv->wq);
priv->wq = NULL;
mcp251x_power_enable(priv->power, 0); mcp251x_power_enable(priv->power, 0);
out_clk: out_clk:
@ -1438,6 +1436,9 @@ static int mcp251x_can_remove(struct spi_device *spi)
mcp251x_power_enable(priv->power, 0); mcp251x_power_enable(priv->power, 0);
destroy_workqueue(priv->wq);
priv->wq = NULL;
clk_disable_unprepare(priv->clk); clk_disable_unprepare(priv->clk);
free_candev(net); free_candev(net);