|
@@ -1222,17 +1222,16 @@ static int __maybe_unused mcp251x_can_resume(struct device *dev)
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct mcp251x_priv *priv = spi_get_drvdata(spi);
|
|
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);
|
|
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);
|
|
queue_work(priv->wq, &priv->restart_work);
|
|
} else {
|
|
} 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;
|
|
priv->force_quit = 0;
|
|
enable_irq(spi->irq);
|
|
enable_irq(spi->irq);
|
|
return 0;
|
|
return 0;
|