diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 17:32:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-02 17:32:46 -0200 |
| commit | 49335aab3d6d92e5022bae733347abb40332e5e6 (patch) | |
| tree | 47bd7e8d02bc2e28bbed9c8dffe088524fafe4b3 /linux/drivers/media/common | |
| parent | 565a187e1f60cb82d9fe226d5668d28f1f85fdb4 (diff) | |
| download | mediapointer-dvb-s2-49335aab3d6d92e5022bae733347abb40332e5e6.tar.gz mediapointer-dvb-s2-49335aab3d6d92e5022bae733347abb40332e5e6.tar.bz2 | |
Backport some changesets touching S/G code
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Backport kernel changesets:
45711f1af6eff1a6d010703b4862e0d2b9afd056
117636092a87a28a013a4acb5de5492645ed620f
642f149031d70415d9318b919d50b71e4724adbd
Also, added newer entreis at compat.h, to avoid needing to add checks for linux
versions inside the source codes.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index e4063a1e0..7fb263dc1 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -158,13 +158,13 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL); if (NULL == sglist) return NULL; + sg_init_table(sglist, nr_pages); for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) { pg = vmalloc_to_page(virt); if (NULL == pg) goto err; BUG_ON(PageHighMem(pg)); - sglist[i].page = pg; - sglist[i].length = PAGE_SIZE; + sg_set_page(&sglist[i], pg, PAGE_SIZE, 0); } return sglist; |