diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:06:49 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:06:49 -0300 |
commit | 8b3ed0d52132397a5de88531f5287b5e7864b76e (patch) | |
tree | 8a2ce91805633daa4063b1910f50c7bad1c327a5 /linux/drivers/media/video/ivtv/ivtv-queue.c | |
parent | 9bd4b1d143281470bf7a00afda20a7368154e213 (diff) | |
parent | 3f5baede21113b8adf1b40d403e19a1ced1b07b8 (diff) | |
download | mediapointer-dvb-s2-8b3ed0d52132397a5de88531f5287b5e7864b76e.tar.gz mediapointer-dvb-s2-8b3ed0d52132397a5de88531f5287b5e7864b76e.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-subdev2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-queue.c')
-rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-queue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-queue.c b/linux/drivers/media/video/ivtv/ivtv-queue.c index ff7b7dede..7fde36e6d 100644 --- a/linux/drivers/media/video/ivtv/ivtv-queue.c +++ b/linux/drivers/media/video/ivtv/ivtv-queue.c @@ -230,7 +230,8 @@ int ivtv_stream_alloc(struct ivtv_stream *s) return -ENOMEM; } if (ivtv_might_use_dma(s)) { - s->sg_handle = pci_map_single(itv->pdev, s->sg_dma, sizeof(struct ivtv_sg_element), s->dma); + s->sg_handle = pci_map_single(itv->pdev, s->sg_dma, + sizeof(struct ivtv_sg_element), PCI_DMA_TODEVICE); ivtv_stream_sync_for_cpu(s); } |