From 37250eadf45186331a36daef27ff94c2a2872486 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 28 Oct 2010 15:41:56 +0200 Subject: [PATCH] --- yaml --- r: 231562 b: refs/heads/master c: 66bde0b70aa2e348ac2c9b9626743c1402b9d466 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/fsldma.c | 4 +--- trunk/drivers/dma/intel_mid_dma.c | 5 ----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c50c1d07f6af..da64bc969328 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2c8e425baa01a4c8e6ae1b90194ed3d3cde0c66 +refs/heads/master: 66bde0b70aa2e348ac2c9b9626743c1402b9d466 diff --git a/trunk/drivers/dma/fsldma.c b/trunk/drivers/dma/fsldma.c index 531230b87976..286c3ac6bdcc 100644 --- a/trunk/drivers/dma/fsldma.c +++ b/trunk/drivers/dma/fsldma.c @@ -1,7 +1,7 @@ /* * Freescale MPC85xx, MPC83xx DMA Engine support * - * Copyright (C) 2007-2010 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved. * * Author: * Zhang Wei , Jul 2007 @@ -1322,8 +1322,6 @@ static int __devinit fsldma_of_probe(struct platform_device *op, fdev->common.device_control = fsl_dma_device_control; fdev->common.dev = &op->dev; - dma_set_mask(&(op->dev), DMA_BIT_MASK(36)); - dev_set_drvdata(&op->dev, fdev); /* diff --git a/trunk/drivers/dma/intel_mid_dma.c b/trunk/drivers/dma/intel_mid_dma.c index 338bc4eed1f3..41941d05bfb9 100644 --- a/trunk/drivers/dma/intel_mid_dma.c +++ b/trunk/drivers/dma/intel_mid_dma.c @@ -1021,11 +1021,6 @@ static irqreturn_t intel_mid_dma_interrupt(int irq, void *data) /*DMA Interrupt*/ pr_debug("MDMA:Got an interrupt on irq %d\n", irq); - if (!mid) { - pr_err("ERR_MDMA:null pointer mid\n"); - return -EINVAL; - } - pr_debug("MDMA: Status %x, Mask %x\n", tfr_status, mid->intr_mask); tfr_status &= mid->intr_mask; if (tfr_status) {