| Message ID | 20210214143734.591789-1-zhengdejin5@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | i2c: thunderx: Fix an issue about missing call to 'pci_free_irq_vectors()' | expand |
On 14.02.21 22:37:34, 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: 4c21541d8da17fb ("i2c: thunderx: Replace pci_enable_msix()") > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> This is already taken care of in pcim_release() as the device is managed (pcim_enable_device()). Your change is not required. -Robert
On 14.02.21 22:37:34, 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: 4c21541d8da17fb ("i2c: thunderx: Replace pci_enable_msix()") > Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> > --- > drivers/i2c/busses/i2c-thunderx-pcidrv.c | 9 ++++++--- FTR, I reviewed the error paths of thunder_i2c_probe_pci() (v5.11-rc1) and all look sane to me. -Robert
diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c index 12c90aa0900e..6a338be4d4b7 100644 --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c @@ -199,11 +199,11 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, ret = devm_request_irq(dev, pci_irq_vector(pdev, 0), octeon_i2c_isr, 0, DRV_NAME, i2c); if (ret) - goto error; + goto error_free_irq; ret = octeon_i2c_init_lowlevel(i2c); if (ret) - goto error; + goto error_free_irq; octeon_i2c_set_clock(i2c); @@ -219,7 +219,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, ret = i2c_add_adapter(&i2c->adap); if (ret) - goto error; + goto error_free_irq; dev_info(i2c->dev, "Probed. Set system clock to %u\n", i2c->sys_freq); @@ -229,6 +229,8 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, return 0; +error_free_irq: + pci_free_irq_vectors(pdev); error: thunder_i2c_clock_disable(dev, i2c->clk); return ret; @@ -238,6 +240,7 @@ static void thunder_i2c_remove_pci(struct pci_dev *pdev) { struct octeon_i2c *i2c = pci_get_drvdata(pdev); + pci_free_irq_vectors(pdev); thunder_i2c_smbus_remove(i2c); thunder_i2c_clock_disable(&pdev->dev, i2c->clk); i2c_del_adapter(&i2c->adap);
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: 4c21541d8da17fb ("i2c: thunderx: Replace pci_enable_msix()") Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com> --- drivers/i2c/busses/i2c-thunderx-pcidrv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)