Commit b3a7a9ab authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Helge Deller
Browse files

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: 81b63420 ("fbdev: mmp: Make use of the helper function dev_err_probe()")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent bfff83c4

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

+1 −1
Original line number Diff line number Diff line
@@ -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);