diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-11-02 09:52:17 +0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-12-03 01:46:07 -0800 |
| commit | 51a1efe2e84493439db32c07471e835c752a7923 (patch) | |
| tree | 7608eba539917e5b666c9f67a63aa82449aeb43e /drivers/dma/intel_mid_dma.c | |
| parent | cbeae41888bddb2d8c23db281de5f38f4be6a9bb (diff) | |
| download | op-kernel-dev-51a1efe2e84493439db32c07471e835c752a7923.zip op-kernel-dev-51a1efe2e84493439db32c07471e835c752a7923.tar.gz | |
dma: intel_mid_dma: fix double free on mid_setup_dma error path
We should not call kfree(dma) in mid_setup_dma error path because
the memory is allocated in intel_mid_dma_probe and will be freed
in intel_mid_dma_probe error path if mid_setup_dma return error.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/intel_mid_dma.c')
| -rw-r--r-- | drivers/dma/intel_mid_dma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c index 338bc4e..4c55d45 100644 --- a/drivers/dma/intel_mid_dma.c +++ b/drivers/dma/intel_mid_dma.c @@ -1075,7 +1075,6 @@ static int mid_setup_dma(struct pci_dev *pdev) if (NULL == dma->dma_pool) { pr_err("ERR_MDMA:pci_pool_create failed\n"); err = -ENOMEM; - kfree(dma); goto err_dma_pool; } @@ -1186,7 +1185,6 @@ err_engine: free_irq(pdev->irq, dma); err_irq: pci_pool_destroy(dma->dma_pool); - kfree(dma); err_dma_pool: pr_err("ERR_MDMA:setup_dma failed: %d\n", err); return err; |
