Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef980cf8 authored by Simon Baatz's avatar Simon Baatz Committed by Boris Brezillon
Browse files

mtd: nand: orion: improve handling of optional clock 



The clock gate used by orion_nand is not available on all platforms.
When getting this optional clock gate, the code masked all errors.
Let's be more precise here and actually only allow ENOENT.

EPROBE_DEFER is handled like any other error code since probe deferral
is not supported by drivers using module_platform_driver_probe().

Signed-off-by: default avatarSimon Baatz <gmbnomis@gmail.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
parent 675b11d9

drivers/mtd/nand/orion_nand.c

+13 −7
Original line number Diff line number Diff line
@@ -156,7 +156,16 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
	/* Not all platforms can gate the clock, so it is not

	   an error if the clock does not exists. */

	info->clk = devm_clk_get(&pdev->dev, NULL);

	if (!IS_ERR(info->clk))

	if (IS_ERR(info->clk)) {

		ret = PTR_ERR(info->clk);

		if (ret == -ENOENT) {

			info->clk = NULL;

		} else {

			dev_err(&pdev->dev, "failed to get clock!\n");

			return ret;

		}

	}



	clk_prepare_enable(info->clk);



	ret = nand_scan(mtd, 1);
@@ -173,9 +182,7 @@ static int __init orion_nand_probe(struct platform_device *pdev) 
	return 0;



no_dev:

	if (!IS_ERR(info->clk))

	clk_disable_unprepare(info->clk);



	return ret;

}
@@ -187,7 +194,6 @@ static int orion_nand_remove(struct platform_device *pdev) 


	nand_release(mtd);



	if (!IS_ERR(info->clk))

	clk_disable_unprepare(info->clk);



	return 0;