| Message ID | 20210215124429.618582-1-zhengdejin5@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] spi: pxa2xx-pci: Fix an issue about missing call to 'pci_free_irq_vectors()' | expand |
On Mon, Feb 15, 2021 at 08:44:29PM +0800, Dejin Zheng wrote: Hi All: I'm very sorry forgot to add change list in patch v2. v1 -> v2: * modify subject name pca2xx-pci to pxa2xx-pci. * add jan and Jarkko's review tag. Dejin > 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") > Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> > Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> > --- > 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); > } > -- > 2.25.0 >
On Mon, Feb 15, 2021 at 08:59:27PM +0800, Dejin Zheng wrote: > On Mon, Feb 15, 2021 at 08:44:29PM +0800, Dejin Zheng wrote: > > Hi All: > > I'm very sorry forgot to add change list in patch v2. > > v1 -> v2: > * modify subject name pca2xx-pci to pxa2xx-pci. > * add jan and Jarkko's review tag. Can you read my comment to v1, please?
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); }
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") Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> --- drivers/spi/spi-pxa2xx-pci.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)