Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / dma / pch_dma.c

diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index 1ac8d4b..a6d0e3d 100644 (file)
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -60,7 +60,7 @@
 #define DMA_DESC_FOLLOW_WITHOUT_IRQ    0x2
 #define DMA_DESC_FOLLOW_WITH_IRQ       0x3
 
-#define MAX_CHAN_NR                    8
+#define MAX_CHAN_NR                    12
 
 #define DMA_MASK_CTL0_MODE     0x33333333
 #define DMA_MASK_CTL2_MODE     0x00003333
@@ -872,8 +872,7 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
        int i;
 
        nr_channels = id->driver_data;
-       pd = kzalloc(sizeof(struct pch_dma)+
-               sizeof(struct pch_dma_chan) * nr_channels, GFP_KERNEL);
+       pd = kzalloc(sizeof(*pd), GFP_KERNEL);
        if (!pd)
                return -ENOMEM;
 
@@ -926,7 +925,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
        }
 
        pd->dma.dev = &pdev->dev;
-       pd->dma.chancnt = nr_channels;
 
        INIT_LIST_HEAD(&pd->dma.channels);
 
@@ -935,7 +933,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev,
 
                pd_chan->chan.device = &pd->dma;
                pd_chan->chan.cookie = 1;
-               pd_chan->chan.chan_id = i;
 
                pd_chan->membase = &regs->desc[i];