From 4e9d669102d268a16267b705376b2854d16486a7 Mon Sep 17 00:00:00 2001 From: Zitong Cai Date: Tue, 25 Feb 2025 17:27:22 +0800 Subject: [PATCH] mfd: display-serdes: Fix pinctrl node shutdown crash Resolve the crash issue caused by closing serdes pinctrl configuration in dts. Change-Id: I0473785d128bf655df9117dc819c502267ffec1e Signed-off-by: Zitong Cai --- drivers/mfd/display-serdes/serdes-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mfd/display-serdes/serdes-core.c b/drivers/mfd/display-serdes/serdes-core.c index 4ccf59c4373e..ee8c1fdd1538 100644 --- a/drivers/mfd/display-serdes/serdes-core.c +++ b/drivers/mfd/display-serdes/serdes-core.c @@ -331,7 +331,7 @@ int serdes_set_pinctrl_default(struct serdes *serdes) { int ret = 0; - if ((!IS_ERR(serdes->pinctrl_node)) && (!IS_ERR(serdes->pins_init))) { + if ((!IS_ERR_OR_NULL(serdes->pinctrl_node)) && (!IS_ERR_OR_NULL(serdes->pins_init))) { ret = pinctrl_select_state(serdes->pinctrl_node, serdes->pins_init); if (ret) dev_err(serdes->dev, "could not set init pins\n"); @@ -346,7 +346,7 @@ int serdes_set_pinctrl_sleep(struct serdes *serdes) { int ret = 0; - if ((!IS_ERR(serdes->pinctrl_node)) && (!IS_ERR(serdes->pins_sleep))) { + if ((!IS_ERR_OR_NULL(serdes->pinctrl_node)) && (!IS_ERR_OR_NULL(serdes->pins_sleep))) { ret = pinctrl_select_state(serdes->pinctrl_node, serdes->pins_sleep); if (ret) dev_err(serdes->dev, "could not set sleep pins\n"); @@ -393,7 +393,7 @@ void serdes_device_poweroff(struct serdes *serdes) { int ret = 0; - if ((!IS_ERR(serdes->pinctrl_node)) && (!IS_ERR(serdes->pins_sleep))) { + if ((!IS_ERR_OR_NULL(serdes->pinctrl_node)) && (!IS_ERR_OR_NULL(serdes->pins_sleep))) { ret = pinctrl_select_state(serdes->pinctrl_node, serdes->pins_sleep); if (ret) dev_err(serdes->dev, "could not set sleep pins\n");