Unverified Commit 99311b8a authored by Mark Brown's avatar Mark Brown
Browse files

spi: atmel-quadspi: Fix uninitialized res 

Merge series from Jinjie Ruan <ruanjinjie@huawei.com>:

Fix uninitialized res in probe function.
parents 11543f53 2d3e6351

drivers/spi/atmel-quadspi.c

+14 −17
Original line number Diff line number Diff line
@@ -602,17 +602,16 @@ static int atmel_qspi_probe(struct platform_device *pdev) 


	/* Map the registers */

	aq->regs = devm_platform_ioremap_resource_byname(pdev, "qspi_base");

	if (IS_ERR(aq->regs)) {

		dev_err(&pdev->dev, "missing registers\n");

		return PTR_ERR(aq->regs);

	}

	if (IS_ERR(aq->regs))

		return dev_err_probe(&pdev->dev, PTR_ERR(aq->regs),

				     "missing registers\n");



	/* Map the AHB memory */

	aq->mem = devm_platform_ioremap_resource_byname(pdev, "qspi_mmap");

	if (IS_ERR(aq->mem)) {

		dev_err(&pdev->dev, "missing AHB memory\n");

		return PTR_ERR(aq->mem);

	}

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mmap");

	aq->mem = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(aq->mem))

		return dev_err_probe(&pdev->dev, PTR_ERR(aq->mem),

				     "missing AHB memory\n");



	aq->mmap_size = resource_size(res);
@@ -621,17 +620,15 @@ static int atmel_qspi_probe(struct platform_device *pdev) 
	if (IS_ERR(aq->pclk))

		aq->pclk = devm_clk_get(&pdev->dev, NULL);



	if (IS_ERR(aq->pclk)) {

		dev_err(&pdev->dev, "missing peripheral clock\n");

		return PTR_ERR(aq->pclk);

	}

	if (IS_ERR(aq->pclk))

		return dev_err_probe(&pdev->dev, PTR_ERR(aq->pclk),

				     "missing peripheral clock\n");



	/* Enable the peripheral clock */

	err = clk_prepare_enable(aq->pclk);

	if (err) {

		dev_err(&pdev->dev, "failed to enable the peripheral clock\n");

		return err;

	}

	if (err)

		return dev_err_probe(&pdev->dev, err,

				     "failed to enable the peripheral clock\n");



	aq->caps = of_device_get_match_data(&pdev->dev);

	if (!aq->caps) {