Skip to content

Commit

Permalink
mtd: nand: orion: improve handling of optional clock
Browse files Browse the repository at this point in the history
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: Simon Baatz <gmbnomis@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  • Loading branch information
gmbnomis authored and Boris Brezillon committed Mar 29, 2017
1 parent 675b11d commit ef980cf
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions drivers/mtd/nand/orion_nand.c
Expand Up @@ -156,8 +156,17 @@ 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))
clk_prepare_enable(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);
if (ret)
Expand All @@ -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);

clk_disable_unprepare(info->clk);
return ret;
}

Expand All @@ -187,8 +194,7 @@ static int orion_nand_remove(struct platform_device *pdev)

nand_release(mtd);

if (!IS_ERR(info->clk))
clk_disable_unprepare(info->clk);
clk_disable_unprepare(info->clk);

return 0;
}
Expand Down

0 comments on commit ef980cf

Please sign in to comment.