summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2019-12-06 15:55:00 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-12 12:17:11 +0100
commitf8832728bf33e652feffac3733a5c191cf1c45d2 (patch)
tree5b23399955a2345fe6677be3170c47083bf09fb7 /drivers/spi
parent59b1cbee0885977b441d3e974e856fd3cc423ac7 (diff)
downloadlinux-stable-f8832728bf33e652feffac3733a5c191cf1c45d2.tar.gz
linux-stable-f8832728bf33e652feffac3733a5c191cf1c45d2.tar.bz2
linux-stable-f8832728bf33e652feffac3733a5c191cf1c45d2.zip
spi: spi-cavium-thunderx: Add missing pci_release_regions()
[ Upstream commit a841e2853e1afecc2ee692b8cc5bff606bc84e4c ] The driver forgets to call pci_release_regions() in probe failure and remove. Add the missed calls to fix it. Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Link: https://lore.kernel.org/r/20191206075500.18525-1-hslester96@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-cavium-thunderx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-cavium-thunderx.c b/drivers/spi/spi-cavium-thunderx.c
index 877937706240..828fbbebc3c4 100644
--- a/drivers/spi/spi-cavium-thunderx.c
+++ b/drivers/spi/spi-cavium-thunderx.c
@@ -81,6 +81,7 @@ static int thunderx_spi_probe(struct pci_dev *pdev,
error:
clk_disable_unprepare(p->clk);
+ pci_release_regions(pdev);
spi_master_put(master);
return ret;
}
@@ -95,6 +96,7 @@ static void thunderx_spi_remove(struct pci_dev *pdev)
return;
clk_disable_unprepare(p->clk);
+ pci_release_regions(pdev);
/* Put everything in a known state. */
writeq(0, p->register_base + OCTEON_SPI_CFG(p));
}