On 2/15/21 11:23 AM, Jan Kiszka wrote:
On 14.02.21 15:57, Dejin Zheng wrote:
Call to 'pci_free_irq_vectors()' are missing both in the error handling
path of the probe function, and in the remove function. So add them.
Fixes: 64e02cb0bdfc7c ("spi: pca2xx-pci: Allow MSI")
Signed-off-by: Dejin Zheng <zhengdejin5@xxxxxxxxx>
---
drivers/spi/spi-pxa2xx-pci.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 14fc41ed2361..1ec840e78ff4 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -254,8 +254,10 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
snprintf(buf, sizeof(buf), "pxa2xx-spi.%d", ssp->port_id);
ssp->clk = clk_register_fixed_rate(&dev->dev, buf , NULL, 0,
c->max_clk_rate);
- if (IS_ERR(ssp->clk))
- return PTR_ERR(ssp->clk);
+ if (IS_ERR(ssp->clk)) {
+ ret = PTR_ERR(ssp->clk);
+ goto err_irq;
+ }
memset(&pi, 0, sizeof(pi));
pi.fwnode = dev->dev.fwnode;
@@ -268,12 +270,16 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev,
pdev = platform_device_register_full(&pi);
if (IS_ERR(pdev)) {
clk_unregister(ssp->clk);
- return PTR_ERR(pdev);
+ ret = PTR_ERR(pdev);
+ goto err_irq;
}
pci_set_drvdata(dev, pdev);
return 0;
+err_irq:
+ pci_free_irq_vectors(dev);
+ return ret;
}
static void pxa2xx_spi_pci_remove(struct pci_dev *dev)
@@ -283,6 +289,7 @@ static void pxa2xx_spi_pci_remove(struct pci_dev *dev)
spi_pdata = dev_get_platdata(&pdev->dev);
+ pci_free_irq_vectors(dev);
platform_device_unregister(pdev);
clk_unregister(spi_pdata->ssp.clk);
}
Reviewed-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
Please fix pca2xx-pci -> pxa2xx-pci in the subject line. With that
change you may add:
Reviewed-by: Jarkko Nikula <jarkko.nikula@xxxxxxxxxxxxxxx>
