diff --git a/[refs] b/[refs] index 611c33637422..cbc0baaee63a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f98781e0f15207b6ab33bee1fae05428be0475b +refs/heads/master: 734c2992828c66cee3feb21ecd30a6ac44aecc51 diff --git a/trunk/drivers/dma/coh901318.c b/trunk/drivers/dma/coh901318.c index b5f2ee0f8e2c..64a937262a40 100644 --- a/trunk/drivers/dma/coh901318.c +++ b/trunk/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;