diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:08:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-16 09:08:43 -0300 |
| commit | b63a5d079a4470d956a235506f7b242ae4105707 (patch) | |
| tree | a8ead825b00315c157b7bdb2c201399019e477a4 /linux/drivers/media/common/saa7146_core.c | |
| parent | 61c970e0a13a189f9ef4d9ed6a4003c2ef71d041 (diff) | |
| parent | aff94781d4209955056c852f6220829e4a9a26a3 (diff) | |
| download | mediapointer-dvb-s2-b63a5d079a4470d956a235506f7b242ae4105707.tar.gz mediapointer-dvb-s2-b63a5d079a4470d956a235506f7b242ae4105707.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common/saa7146_core.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 06edb5fc1..a2ca9f1b8 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -27,7 +27,7 @@ static int saa7146_num; unsigned int saa7146_debug; -module_param(saa7146_debug, int, 0644); +module_param(saa7146_debug, uint, 0644); MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)"); #if 0 /* keep */ @@ -130,10 +130,10 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) /********************************************************************************/ /* common page table functions */ -char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt) +void *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt) { int pages = (length+PAGE_SIZE-1)/PAGE_SIZE; - char *mem = vmalloc_32(length); + void *mem = vmalloc_32(length); int slen = 0; if (NULL == mem) @@ -168,7 +168,7 @@ err_null: return NULL; } -void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt) +void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, void *mem, struct saa7146_pgtable *pt) { pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE); saa7146_pgtable_free(pci, pt); |