From: Fabio Estevam Date: Fri, 17 Oct 2014 18:31:08 +0000 (-0300) Subject: mtd: fsl-quadspi: Propagate the error from of_modalias_node() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b26171e392c7d3952b6eeb6da62a861c5317e438;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git mtd: fsl-quadspi: Propagate the error from of_modalias_node() The 'map_failed' label will return 'ret', so we need to assign the error code to 'ret', otherwise the probe function will return success. Signed-off-by: Fabio Estevam Acked-by: Huang Shijie Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/spi-nor/fsl-quadspi.c b/drivers/mtd/spi-nor/fsl-quadspi.c index d5269a26c839..94e73553abb3 100644 --- a/drivers/mtd/spi-nor/fsl-quadspi.c +++ b/drivers/mtd/spi-nor/fsl-quadspi.c @@ -905,7 +905,8 @@ static int fsl_qspi_probe(struct platform_device *pdev) nor->prepare = fsl_qspi_prep; nor->unprepare = fsl_qspi_unprep; - if (of_modalias_node(np, modalias, sizeof(modalias)) < 0) + ret = of_modalias_node(np, modalias, sizeof(modalias)); + if (ret < 0) goto map_failed; ret = of_property_read_u32(np, "spi-max-frequency",