Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / dma / pl330.c

diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 621134fdba4cadd031ccbebd8a52ed34c571ff8f..571041477ab2984230fb1d6f4f9849276f0f046f 100644 (file)
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -887,11 +887,9 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
                spin_lock_init(&pch->lock);
                pch->pl330_chid = NULL;
                pch->chan.device = pd;
-               pch->chan.chan_id = i;
                pch->dmac = pdmac;
 
                /* Add the channel to the DMAC list */
-               pd->chancnt++;
                list_add_tail(&pch->chan.device_node, &pd->channels);
        }