spi: bcm-qspi: fIX some error handling paths

For some reason, commit c0368e4db4a3 ("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: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index a172ab299e80316ee904a1c9277a36755699e4d4..1596d35498c5a5567bc844c11c2fd1463867dde5 100644 (file)
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -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 {