diff options
| author | Anson Huang <Anson.Huang@nxp.com> | 2019-05-24 13:51:01 +0800 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2019-06-05 14:09:24 +0800 |
| commit | 4c396a604a57da8f883a8b3368d83181680d6907 (patch) | |
| tree | eb43d32adfcc342d6f974af60277bc071e080b0a | |
| parent | d8dfab0f4d0669ae299511e3ab3e79f312476f75 (diff) | |
| download | linux-4c396a604a57da8f883a8b3368d83181680d6907.tar.bz2 | |
soc: imx: soc-imx8: Correct return value of error handle
Current implementation of i.MX8 SoC driver returns -ENODEV
for all cases of error during initialization, this is incorrect.
This patch fixes them using correct return value according
to different errors.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
Reviewed-by: Leonard Crestez <leonard.crestez@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | drivers/soc/imx/soc-imx8.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8.c index d377a90f3a2f..0a8681f208d3 100644 --- a/drivers/soc/imx/soc-imx8.c +++ b/drivers/soc/imx/soc-imx8.c @@ -102,7 +102,7 @@ static int __init imx8_soc_init(void) soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL); if (!soc_dev_attr) - return -ENODEV; + return -ENOMEM; soc_dev_attr->family = "Freescale i.MX"; @@ -112,8 +112,10 @@ static int __init imx8_soc_init(void) goto free_soc; id = of_match_node(imx8_soc_match, root); - if (!id) + if (!id) { + ret = -ENODEV; goto free_soc; + } data = id->data; if (data) { @@ -123,12 +125,16 @@ static int __init imx8_soc_init(void) } soc_dev_attr->revision = imx8_revision(soc_rev); - if (!soc_dev_attr->revision) + if (!soc_dev_attr->revision) { + ret = -ENOMEM; goto free_soc; + } soc_dev = soc_device_register(soc_dev_attr); - if (IS_ERR(soc_dev)) + if (IS_ERR(soc_dev)) { + ret = PTR_ERR(soc_dev); goto free_rev; + } of_node_put(root); @@ -139,6 +145,6 @@ free_rev: free_soc: kfree(soc_dev_attr); of_node_put(root); - return -ENODEV; + return ret; } device_initcall(imx8_soc_init); |