summaryrefslogtreecommitdiffstats
path: root/drivers/dma/sh
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-10-30 13:07:18 +0530
committerVinod Koul <vinod.koul@intel.com>2013-10-30 13:07:18 +0530
commitb967aecf1714c10d1e6c045e43b6385884f1ca77 (patch)
treea6aebedea9c5ddd1bbaf42e913be01e17f98c735 /drivers/dma/sh
parent959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff)
parent2abd5f1b97fce6e197be01d67a9567c7793c80d3 (diff)
downloadop-kernel-dev-b967aecf1714c10d1e6c045e43b6385884f1ca77.zip
op-kernel-dev-b967aecf1714c10d1e6c045e43b6385884f1ca77.tar.gz
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/sh')
-rw-r--r--drivers/dma/sh/shdmac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 1069e88..0d765c0 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -685,7 +685,7 @@ MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
static int sh_dmae_probe(struct platform_device *pdev)
{
const struct sh_dmae_pdata *pdata;
- unsigned long irqflags = IRQF_DISABLED,
+ unsigned long irqflags = 0,
chan_flag[SH_DMAE_MAX_CHANNELS] = {};
int errirq, chan_irq[SH_DMAE_MAX_CHANNELS];
int err, i, irq_cnt = 0, irqres = 0, irq_cap = 0;
@@ -838,7 +838,7 @@ static int sh_dmae_probe(struct platform_device *pdev)
IORESOURCE_IRQ_SHAREABLE)
chan_flag[irq_cnt] = IRQF_SHARED;
else
- chan_flag[irq_cnt] = IRQF_DISABLED;
+ chan_flag[irq_cnt] = 0;
dev_dbg(&pdev->dev,
"Found IRQ %d for channel %d\n",
i, irq_cnt);
OpenPOWER on IntegriCloud