mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 05:20:49 +07:00
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: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
f722406faa
commit
4a577f5275
@ -408,6 +408,12 @@ static int mcfqspi_probe(struct platform_device *pdev)
|
|||||||
struct mcfqspi_platform_data *pdata;
|
struct mcfqspi_platform_data *pdata;
|
||||||
int status;
|
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));
|
master = spi_alloc_master(&pdev->dev, sizeof(*mcfqspi));
|
||||||
if (master == NULL) {
|
if (master == NULL) {
|
||||||
dev_dbg(&pdev->dev, "spi_alloc_master failed\n");
|
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);
|
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->bus_num = pdata->bus_num;
|
||||||
master->num_chipselect = pdata->num_chipselect;
|
master->num_chipselect = pdata->num_chipselect;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user