mtd: rawnand: qcom: Return actual error code instead of -ENODEV

[ Upstream commit 55fbb9ba4f06cb6aff32daca1e1910173c13ec51 ]

In qcom_probe_nand_devices() function, the error code returned by
qcom_nand_host_init_and_register() is converted to -ENODEV in the case
of failure. This poses issue if -EPROBE_DEFER is returned when the
dependency is not available for a component like parser.

So let's restructure the error handling logic a bit and return the
actual error code in case of qcom_nand_host_init_and_register() failure.

Fixes: c76b78d8ec05 ("mtd: nand: Qualcomm NAND controller driver")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index dfc17a28a06b97be11776ee85c2e71c089b12d11..b99d2e9d1e2c49a86157c8e06d08df067928a87e 100644 (file)
--- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -2874,7 +2874,7 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc)
        struct device *dev = nandc->dev;
        struct device_node *dn = dev->of_node, *child;
        struct qcom_nand_host *host;
        struct device *dev = nandc->dev;
        struct device_node *dn = dev->of_node, *child;
        struct qcom_nand_host *host;

-       int ret;
+       int ret = -ENODEV;

 
        for_each_available_child_of_node(dn, child) {
                host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
 
        for_each_available_child_of_node(dn, child) {
                host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);


@@ -2892,10 +2892,7 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc)
                list_add_tail(&host->node, &nandc->host_list);
        }
 
                list_add_tail(&host->node, &nandc->host_list);
        }
 

-       if (list_empty(&nandc->host_list))
-               return -ENODEV;
-
-       return 0;
+       return ret;

 }
 
 /* parse custom DT properties here */
 }
 
 /* parse custom DT properties here */