Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b401c1 authored by Stefan Agner's avatar Stefan Agner Committed by Marc Kleine-Budde
Browse files

can: mcp251x: fix resume when device is down 



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

Fixes: bf66f373 ("can: mcp251x: Move to threaded interrupts instead of workqueues.")
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 15afb10d

drivers/net/can/spi/mcp251x.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -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);

		queue_work(priv->wq, &priv->restart_work);



	} else {

	if (priv->after_suspend & AFTER_SUSPEND_UP) {

	if (priv->after_suspend & AFTER_SUSPEND_UP) {

		mcp251x_power_enable(priv->transceiver, 1);

		mcp251x_power_enable(priv->transceiver, 1);

		queue_work(priv->wq, &priv->restart_work);

		queue_work(priv->wq, &priv->restart_work);

	} else {

	} 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;