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

Commit 76aeec83 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Marc Kleine-Budde
Browse files

can: mcp251x: Fix regulators operation without CONFIG_REGULATOR 



If CONFIG_REGULATOR is not set, devm_regulator_get() returns NULL,
so use IS_ERR_OR_NULL() macro for checks.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 3e66d013

drivers/net/can/mcp251x.c

+2 −2
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static int mcp251x_hw_probe(struct spi_device *spi) 


static int mcp251x_power_enable(struct regulator *reg, int enable)

{

	if (IS_ERR(reg))

	if (IS_ERR_OR_NULL(reg))

		return 0;



	if (enable)
@@ -1218,7 +1218,7 @@ static int __maybe_unused mcp251x_can_suspend(struct device *dev) 
		priv->after_suspend = AFTER_SUSPEND_DOWN;

	}



	if (!IS_ERR(priv->power)) {

	if (!IS_ERR_OR_NULL(priv->power)) {

		regulator_disable(priv->power);

		priv->after_suspend |= AFTER_SUSPEND_POWER;

	}