github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

dmaengine: plx_dma: add a missing put_device() on error path

Browse Source 
[ Upstream commit 07503e6aef ]

Add a missing put_device(&pdev->dev) if the call to
dma_async_device_register(dma); fails.

Fixes: 905ca51e63 ("dmaengine: plx-dma: Introduce PLX DMA engine PCI driver skeleton")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
Link: https://lore.kernel.org/r/YFnq/0IQzixtAbC1@mwanda
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dan Carpenter 2021-03-23 16:19:59 +03:00 committed by Greg Kroah-Hartman
parent ac030f5c56
commit 4c59c5c866
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/dma/plx_dma.c
View File

@ -507,10 +507,8 @@ static int plx_dma_create(struct pci_dev *pdev)
rc = request_irq(pci_irq_vector(pdev, 0), plx_dma_isr, 0, rc = request_irq(pci_irq_vector(pdev, 0), plx_dma_isr, 0,
KBUILD_MODNAME, plxdev); KBUILD_MODNAME, plxdev);
if (rc) { if (rc)
kfree(plxdev); goto free_plx;
return rc;
}
spin_lock_init(&plxdev->ring_lock); spin_lock_init(&plxdev->ring_lock);
tasklet_setup(&plxdev->desc_task, plx_dma_desc_task); tasklet_setup(&plxdev->desc_task, plx_dma_desc_task);
@ -540,14 +538,20 @@ static int plx_dma_create(struct pci_dev *pdev)
rc = dma_async_device_register(dma); rc = dma_async_device_register(dma);
if (rc) { if (rc) {
pci_err(pdev, "Failed to register dma device: %d\n", rc); pci_err(pdev, "Failed to register dma device: %d\n", rc);
free_irq(pci_irq_vector(pdev, 0), plxdev); goto put_device;
kfree(plxdev);
return rc;
} }
pci_set_drvdata(pdev, plxdev); pci_set_drvdata(pdev, plxdev);
return 0; return 0;
put_device:
put_device(&pdev->dev);
free_irq(pci_irq_vector(pdev, 0), plxdev);
free_plx:
kfree(plxdev);
return rc;
} }
static int plx_dma_probe(struct pci_dev *pdev, static int plx_dma_probe(struct pci_dev *pdev,