mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 02:50:49 +09:00
fbdev: mmp: Fix deferred clk handling in mmphw_probe()
[ Upstream commitb3a7a9ab65] 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:81b6342056("fbdev: mmp: Make use of the helper function dev_err_probe()") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ce818ee162
commit
ae69d36d46
@@ -514,9 +514,9 @@ static int mmphw_probe(struct platform_device *pdev)
|
||||
/* get clock */
|
||||
ctrl->clk = devm_clk_get(ctrl->dev, mi->clk_name);
|
||||
if (IS_ERR(ctrl->clk)) {
|
||||
ret = PTR_ERR(ctrl->clk);
|
||||
dev_err_probe(ctrl->dev, ret,
|
||||
"unable to get clk %s\n", mi->clk_name);
|
||||
ret = -ENOENT;
|
||||
goto failed;
|
||||
}
|
||||
clk_prepare_enable(ctrl->clk);
|
||||
|
||||
Reference in New Issue
Block a user