summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-02-06 09:43:41 +0100
committerDan Williams <dan.j.williams@intel.com>2010-02-10 12:07:28 -0700
commit734c2992828c66cee3feb21ecd30a6ac44aecc51 (patch)
treec732007f463393046dc83cc3d6b5953cb076aa32
parent8f98781e0f15207b6ab33bee1fae05428be0475b (diff)
downloadblackbird-op-linux-734c2992828c66cee3feb21ecd30a6ac44aecc51.tar.gz
blackbird-op-linux-734c2992828c66cee3feb21ecd30a6ac44aecc51.zip
drivers/dma: Correct NULL test
cohd_fin has already been verified not to be NULL, so the argument to BUG_ON cannot be true. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/dma/coh901318.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c
index b5f2ee0f8e2c..64a937262a40 100644
--- a/drivers/dma/coh901318.c
+++ b/drivers/dma/coh901318.c
@@ -613,8 +613,6 @@ static void dma_tasklet(unsigned long data)
cohd_fin->pending_irqs--;
cohc->completed = cohd_fin->desc.cookie;
- BUG_ON(cohc->nbr_active_done && cohd_fin == NULL);
-
if (cohc->nbr_active_done == 0)
return;
OpenPOWER on IntegriCloud