diff --git a/[refs] b/[refs] index a9b6b55f5235..e25fb6f50d27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbd65312ba6b508e994d40729e84a51301870bcc +refs/heads/master: 21e93c1e7dae0e8b1914a522c331f0f7763fa89d diff --git a/trunk/drivers/dma/dw_dmac.c b/trunk/drivers/dma/dw_dmac.c index dd7a8192d5a0..c74a7ec9bb9f 100644 --- a/trunk/drivers/dma/dw_dmac.c +++ b/trunk/drivers/dma/dw_dmac.c @@ -347,7 +347,7 @@ dwc_descriptor_complete(struct dw_dma_chan *dwc, struct dw_desc *desc, spin_unlock_irqrestore(&dwc->lock, flags); - if (callback_required && callback) + if (callback) callback(param); }