Commit ba10c5d3 authored Mar 02, 2021 by Manivannan Sadhasivam Committed by Greg Kroah-Hartman May 22, 2021

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: c76b78d8 ("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>

parent 4a064cb4

drivers/mtd/nand/raw/qcom_nandc.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -2865,7 +2865,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;
		int ret;
		int ret = -ENODEV;

		for_each_available_child_of_node(dn, child) {
		host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
		@@ -2883,10 +2883,7 @@ static int qcom_probe_nand_devices(struct qcom_nand_controller *nandc)
		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 */