Skip to content

Commit b3a7a9a

Browse files
tititiou36hdeller
authored andcommitted
fbdev: mmp: Fix deferred clk handling in mmphw_probe()
When dev_err_probe() is called, 'ret' holds the value of the previous successful devm_request_irq() call. 'ret' should be assigned with a meaningful value before being used in dev_err_probe(). While at it, use and return "PTR_ERR(ctrl->clk)" instead of a hard-coded "-ENOENT" so that -EPROBE_DEFER is handled and propagated correctly. Fixes: 81b6342 ("fbdev: mmp: Make use of the helper function dev_err_probe()") Signed-off-by: Christophe JAILLET <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent bfff83c commit b3a7a9a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/video/fbdev/mmp/hw/mmp_ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,9 @@ static int mmphw_probe(struct platform_device *pdev)
514514
/* get clock */
515515
ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name);
516516
if (IS_ERR(ctrl->clk)) {
517+
ret = PTR_ERR(ctrl->clk);
517518
dev_err_probe(ctrl->dev, ret,
518519
"unable to get clk %s\n", mi->clk_name);
519-
ret = -ENOENT;
520520
goto failed;
521521
}
522522
clk_prepare_enable(ctrl->clk);

0 commit comments

Comments
 (0)