Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a577f52 authored by Wei Yongjun's avatar Wei Yongjun Committed by Mark Brown
Browse files

spi: coldfire-qspi: fix error return code in mcfqspi_probe() 



If pdev->dev.platform_data is not set, mcfqspi_probe() will return 0
and release all the resources, in this case, we should return a error
code instead of 0.
This patch fix to return -ENOENT in this case and move the check for
pdev->dev.platform_data to the begin of this function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f722406f

drivers/spi/spi-coldfire-qspi.c

+6 −5
Original line number Diff line number Diff line
@@ -408,6 +408,12 @@ static int mcfqspi_probe(struct platform_device *pdev) 
	struct mcfqspi_platform_data *pdata;

	int status;



	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_dbg(&pdev->dev, "platform data is missing\n");

		return -ENOENT;

	}



	master = spi_alloc_master(&pdev->dev, sizeof(*mcfqspi));

	if (master == NULL) {

		dev_dbg(&pdev->dev, "spi_alloc_master failed\n");
@@ -458,11 +464,6 @@ static int mcfqspi_probe(struct platform_device *pdev) 
	}

	clk_enable(mcfqspi->clk);



	pdata = pdev->dev.platform_data;

	if (!pdata) {

		dev_dbg(&pdev->dev, "platform data is missing\n");

		goto fail4;

	}

	master->bus_num = pdata->bus_num;

	master->num_chipselect = pdata->num_chipselect;