| From eaf2139354786c11d643651e65f1f76ffd37323e Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Timo=20Schl=C3=BC=C3=9Fler?= <schluessler@krause.de> |
| Date: Fri, 11 Oct 2019 15:38:19 +0200 |
| Subject: [PATCH] can: mcp251x: mcp251x_restart_work_handler(): Fix potential |
| force_quit race condition |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 27a0e54bae09d2dd023a01254db506d61cc50ba1 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c |
| index fc29252500c6..68e5c52b9002 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) { |
| -- |
| 2.7.4 |
| |
