[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250612191825.3646364-1-brett.werling@garmin.com>
Date: Thu, 12 Jun 2025 14:18:25 -0500
From: Brett Werling <brett.werling@...min.com>
To: <linux-can@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: Marc Kleine-Budde <mkl@...gutronix.de>,
Vincent Mailhol
<mailhol.vincent@...adoo.fr>, <bwerl.dev@...il.com>,
Brett Werling
<brett.werling@...min.com>
Subject: [PATCH] can: tcan4x5x: fix power regulator retrieval during probe
Fixes the power regulator retrieval in tcan4x5x_can_probe() by ensuring
the regulator pointer is not set to NULL in the successful return from
devm_regulator_get_optional().
Fixes: 3814ca3a10be ("can: tcan4x5x: tcan4x5x_can_probe(): turn on the power before parsing the config")
Signed-off-by: Brett Werling <brett.werling@...min.com>
---
drivers/net/can/m_can/tcan4x5x-core.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c
index e5c162f8c589..8edaa339d590 100644
--- a/drivers/net/can/m_can/tcan4x5x-core.c
+++ b/drivers/net/can/m_can/tcan4x5x-core.c
@@ -411,10 +411,11 @@ static int tcan4x5x_can_probe(struct spi_device *spi)
priv = cdev_to_priv(mcan_class);
priv->power = devm_regulator_get_optional(&spi->dev, "vsup");
- if (PTR_ERR(priv->power) == -EPROBE_DEFER) {
- ret = -EPROBE_DEFER;
- goto out_m_can_class_free_dev;
- } else {
+ if (IS_ERR(priv->power)) {
+ if (PTR_ERR(priv->power) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto out_m_can_class_free_dev;
+ }
priv->power = NULL;
}
--
2.49.0
Powered by blists - more mailing lists