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

Unverified Commit bc3cc752 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Mark Brown
Browse files

spi: bcm-qspi: fIX some error handling paths 



For some reason, commit c0368e4d ("spi: bcm-qspi: Fix use after free
in bcm_qspi_probe() in error path") has updated some gotos, but not all of
them.

This looks spurious, so fix it.

Fixes: fa236a7e ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7928b2cb

drivers/spi/spi-bcm-qspi.c

+2 −2
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 
		qspi->base[MSPI]  = devm_ioremap_resource(dev, res);

		if (IS_ERR(qspi->base[MSPI])) {

			ret = PTR_ERR(qspi->base[MSPI]);

			goto qspi_probe_err;

			goto qspi_resource_err;

		}

	} else {

		goto qspi_resource_err;
@@ -1258,7 +1258,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 
		qspi->base[BSPI]  = devm_ioremap_resource(dev, res);

		if (IS_ERR(qspi->base[BSPI])) {

			ret = PTR_ERR(qspi->base[BSPI]);

			goto qspi_probe_err;

			goto qspi_resource_err;

		}

		qspi->bspi_mode = true;

	} else {