diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:37:18 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-30 08:37:18 +0100 |
| commit | b967aecf1714c10d1e6c045e43b6385884f1ca77 (patch) | |
| tree | a6aebedea9c5ddd1bbaf42e913be01e17f98c735 /drivers/dma/coh901318.c | |
| parent | Linux 3.12-rc7 (diff) | |
| parent | dma: edma: Increase maximum SG limit to 20 (diff) | |
| download | linux-b967aecf1714c10d1e6c045e43b6385884f1ca77.tar.xz linux-b967aecf1714c10d1e6c045e43b6385884f1ca77.zip | |
Merge branch 'for-linus' into next
Conflicts:
drivers/dma/edma.c
Moved the memory leak fix post merge
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/coh901318.c')
| -rw-r--r-- | drivers/dma/coh901318.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 31011d2a26fc..3025b9107af2 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c @@ -2694,7 +2694,7 @@ static int __init coh901318_probe(struct platform_device *pdev) if (irq < 0) return irq; - err = devm_request_irq(&pdev->dev, irq, dma_irq_handler, IRQF_DISABLED, + err = devm_request_irq(&pdev->dev, irq, dma_irq_handler, 0, "coh901318", base); if (err) return err; |