diff options
Diffstat (limited to 'drivers/dma/pch_dma.c')
-rw-r--r-- | drivers/dma/pch_dma.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c index 1ac8d4b580b7..a6d0e3dbed07 100644 --- a/drivers/dma/pch_dma.c +++ b/drivers/dma/pch_dma.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #define DMA_DESC_FOLLOW_WITHOUT_IRQ 0x2 | 60 | #define DMA_DESC_FOLLOW_WITHOUT_IRQ 0x2 |
61 | #define DMA_DESC_FOLLOW_WITH_IRQ 0x3 | 61 | #define DMA_DESC_FOLLOW_WITH_IRQ 0x3 |
62 | 62 | ||
63 | #define MAX_CHAN_NR 8 | 63 | #define MAX_CHAN_NR 12 |
64 | 64 | ||
65 | #define DMA_MASK_CTL0_MODE 0x33333333 | 65 | #define DMA_MASK_CTL0_MODE 0x33333333 |
66 | #define DMA_MASK_CTL2_MODE 0x00003333 | 66 | #define DMA_MASK_CTL2_MODE 0x00003333 |
@@ -872,8 +872,7 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev, | |||
872 | int i; | 872 | int i; |
873 | 873 | ||
874 | nr_channels = id->driver_data; | 874 | nr_channels = id->driver_data; |
875 | pd = kzalloc(sizeof(struct pch_dma)+ | 875 | pd = kzalloc(sizeof(*pd), GFP_KERNEL); |
876 | sizeof(struct pch_dma_chan) * nr_channels, GFP_KERNEL); | ||
877 | if (!pd) | 876 | if (!pd) |
878 | return -ENOMEM; | 877 | return -ENOMEM; |
879 | 878 | ||
@@ -926,7 +925,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev, | |||
926 | } | 925 | } |
927 | 926 | ||
928 | pd->dma.dev = &pdev->dev; | 927 | pd->dma.dev = &pdev->dev; |
929 | pd->dma.chancnt = nr_channels; | ||
930 | 928 | ||
931 | INIT_LIST_HEAD(&pd->dma.channels); | 929 | INIT_LIST_HEAD(&pd->dma.channels); |
932 | 930 | ||
@@ -935,7 +933,6 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev, | |||
935 | 933 | ||
936 | pd_chan->chan.device = &pd->dma; | 934 | pd_chan->chan.device = &pd->dma; |
937 | pd_chan->chan.cookie = 1; | 935 | pd_chan->chan.cookie = 1; |
938 | pd_chan->chan.chan_id = i; | ||
939 | 936 | ||
940 | pd_chan->membase = ®s->desc[i]; | 937 | pd_chan->membase = ®s->desc[i]; |
941 | 938 | ||