diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-23 15:29:28 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-23 15:29:28 +0000 |
commit | a3391c9355f916cafe05e8ca466c14e43d22fbef (patch) | |
tree | 1df26fb1acc1210a76c1c504547fe5f37586c91c /wctdm.c | |
parent | 1de0ad1a5e348aeb4724a73d11a024597630567f (diff) |
Merged revisions 1920 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1920 | kpfleming | 2007-01-23 09:25:42 -0600 (Tue, 23 Jan 2007) | 2 lines
clean up various compiler warnings
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@1921 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wctdm.c')
-rw-r--r-- | wctdm.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -345,8 +345,8 @@ struct wctdm { unsigned long ioaddr; dma_addr_t readdma; dma_addr_t writedma; - volatile int *writechunk; /* Double-word aligned write memory */ - volatile int *readchunk; /* Double-word aligned read memory */ + volatile unsigned int *writechunk; /* Double-word aligned write memory */ + volatile unsigned int *readchunk; /* Double-word aligned read memory */ struct zt_chan chans[NUM_CARDS]; }; @@ -2281,7 +2281,7 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic /* Allocate enough memory for two zt chunks, receive and transmit. Each sample uses 32 bits. Allocate an extra set just for control too */ - wc->writechunk = (int *)pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &wc->writedma); + wc->writechunk = pci_alloc_consistent(pdev, ZT_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, &wc->writedma); if (!wc->writechunk) { printk("wctdm: Unable to allocate DMA-able memory\n"); if (wc->freeregion) |