diff options
| author | Timo Schlüßler <schluessler@krause.de> | 2019-10-11 16:38:19 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 00:33:40 +0300 |
| commit | f248c2b7e71c0bec5839bfc6be6d4450a8e47e66 (patch) | |
| tree | 4c4e864d3cdd67345ab67a4b3738d96fdcf14d06 /drivers/net | |
| parent | c9161071a6776637fe94696546ce0599256776f9 (diff) | |
| download | linux-f248c2b7e71c0bec5839bfc6be6d4450a8e47e66.tar.xz | |
can: mcp251x: mcp251x_restart_work_handler(): Fix potential force_quit race condition
[ Upstream commit 27a0e54bae09d2dd023a01254db506d61cc50ba1 ]
In mcp251x_restart_work_handler() the variable to stop the interrupt
handler (priv->force_quit) is reset after the chip is restarted and thus
a interrupt might occur.
This patch fixes the potential race condition by resetting force_quit
before enabling interrupts.
Signed-off-by: Timo Schlüßler <schluessler@krause.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/spi/mcp251x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index 5d6f8977df3f..c0ee0fa90970 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -759,6 +759,7 @@ static void mcp251x_restart_work_handler(struct work_struct *ws) if (priv->after_suspend) { mcp251x_hw_reset(spi); mcp251x_setup(net, spi); + priv->force_quit = 0; if (priv->after_suspend & AFTER_SUSPEND_RESTART) { mcp251x_set_normal_mode(spi); } else if (priv->after_suspend & AFTER_SUSPEND_UP) { @@ -770,7 +771,6 @@ static void mcp251x_restart_work_handler(struct work_struct *ws) mcp251x_hw_sleep(spi); } priv->after_suspend = 0; - priv->force_quit = 0; } if (priv->restart_tx) { |