diff options
author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2018-03-13 14:36:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-03-14 12:37:28 -0400 |
commit | bc3cc75281b3c2b1c5355d88d147b66a753bb9a5 (patch) | |
tree | 3f17dd44865b891188629e6d72404e93ed58140e | |
parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) |
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>
-rw-r--r-- | drivers/spi/spi-bcm-qspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index a172ab299e80..1596d35498c5 100644 --- 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, | |||
1247 | qspi->base[MSPI] = devm_ioremap_resource(dev, res); | 1247 | qspi->base[MSPI] = devm_ioremap_resource(dev, res); |
1248 | if (IS_ERR(qspi->base[MSPI])) { | 1248 | if (IS_ERR(qspi->base[MSPI])) { |
1249 | ret = PTR_ERR(qspi->base[MSPI]); | 1249 | ret = PTR_ERR(qspi->base[MSPI]); |
1250 | goto qspi_probe_err; | 1250 | goto qspi_resource_err; |
1251 | } | 1251 | } |
1252 | } else { | 1252 | } else { |
1253 | goto qspi_resource_err; | 1253 | goto qspi_resource_err; |
@@ -1258,7 +1258,7 @@ int bcm_qspi_probe(struct platform_device *pdev, | |||
1258 | qspi->base[BSPI] = devm_ioremap_resource(dev, res); | 1258 | qspi->base[BSPI] = devm_ioremap_resource(dev, res); |
1259 | if (IS_ERR(qspi->base[BSPI])) { | 1259 | if (IS_ERR(qspi->base[BSPI])) { |
1260 | ret = PTR_ERR(qspi->base[BSPI]); | 1260 | ret = PTR_ERR(qspi->base[BSPI]); |
1261 | goto qspi_probe_err; | 1261 | goto qspi_resource_err; |
1262 | } | 1262 | } |
1263 | qspi->bspi_mode = true; | 1263 | qspi->bspi_mode = true; |
1264 | } else { | 1264 | } else { |