[PATCH 2/2] staging: most: dim2: fix error handling in fsl_mx6_enable
From: Artem Lytkin
Date: Mon Feb 16 2026 - 15:19:37 EST
Address several error handling issues in fsl_mx6_enable():
- Replace IS_ERR_OR_NULL() with IS_ERR() for devm_clk_get() return
value checks, since devm_clk_get() never returns NULL on error.
- Replace hardcoded -EFAULT returns with dev_err_probe() which both
propagates the actual error code from devm_clk_get() and suppresses
log messages during probe deferral.
- Remove an unnecessary string indirection in the clk_prepare_enable
error message.
Signed-off-by: Artem Lytkin <iprintercanon@xxxxxxxxx>
---
drivers/staging/most/dim2/dim2.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c
index 1f07c37df..15eaf4ff8 100644
--- a/drivers/staging/most/dim2/dim2.c
+++ b/drivers/staging/most/dim2/dim2.c
@@ -923,24 +923,23 @@ static int fsl_mx6_enable(struct platform_device *pdev)
int ret;
dev->clk = devm_clk_get(&pdev->dev, "mlb");
- if (IS_ERR_OR_NULL(dev->clk)) {
- dev_err(&pdev->dev, "unable to get mlb clock\n");
- return -EFAULT;
- }
+ if (IS_ERR(dev->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(dev->clk),
+ "unable to get mlb clock\n");
ret = clk_prepare_enable(dev->clk);
if (ret) {
- dev_err(&pdev->dev, "%s\n", "clk_prepare_enable failed");
+ dev_err(&pdev->dev, "clk_prepare_enable failed\n");
return ret;
}
if (dev->clk_speed >= CLK_2048FS) {
/* enable pll */
dev->clk_pll = devm_clk_get(&pdev->dev, "pll8_mlb");
- if (IS_ERR_OR_NULL(dev->clk_pll)) {
- dev_err(&pdev->dev, "unable to get mlb pll clock\n");
+ if (IS_ERR(dev->clk_pll)) {
clk_disable_unprepare(dev->clk);
- return -EFAULT;
+ return dev_err_probe(&pdev->dev, PTR_ERR(dev->clk_pll),
+ "unable to get mlb pll clock\n");
}
writel(0x888, dev->io_base + 0x38);
--
2.43.0