Patch "can: mcp251x: fix resume when device is down" has been added to the 4.1-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
can: mcp251x: fix resume when device is down
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
can-mcp251x-fix-resume-when-device-is-down.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
25b401c1816ae64bcc5dcb1d39ab41812522a0ceMon Sep 17 00:00:00 2001
From: Stefan Agner <[email protected]>
Date: Mon, 18 May 2015 18:33:27 +0200
Subject: can: mcp251x: fix resume when device is down
From: Stefan Agner <[email protected]>
commit 25b401c1816ae64bcc5dcb1d39ab41812522a0ce upstream.
If a valid power regulator or a dummy regulator is used (which happens to be the case when no regulator is specified), restart_work is queued no matter whether the device was running or not at suspend time. Since work queues get initialized in the ndo_open callback, resuming leads to a NULL pointer exception.
Reverse exactly the steps executed at suspend time:
- Enable the power regulator in any case
- Enable the transceiver regulator if the device was running, even in case we have a power regulator
- Queue restart_work only in case the device was running
--- drivers/net/can/spi/mcp251x.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/net/can/spi/mcp251x.c +6 -7
@@ -1221,17 +1221,16 @@ static int __maybe_unused mcp251x_can_restruct spi_device *spi =to_spi_device (dev);struct mcp251x_priv *priv =spi_get_drvdata (spi); -if (priv->after_suspend &AFTER_SUSPEND_POWER ) { +if (priv->after_suspend &AFTER_SUSPEND_POWER )mcp251x_power_enable (priv->power,1 ); + +if (priv->after_suspend &AFTER_SUSPEND_UP ) { +mcp251x_power_enable (priv->transceiver,1 );queue_work (priv->wq, &priv->restart_work); }else { -if (priv->after_suspend &AFTER_SUSPEND_UP ) { -mcp251x_power_enable (priv->transceiver,1 ); -queue_work (priv->wq, &priv->restart_work); - }else { - priv->after_suspend =0 ; - } + priv->after_suspend =0 ; } + priv->force_quit =0 ;enable_irq (spi->irq);return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/can-mcp251x-fix-resume-when-device-is-down.patch