From 4cb574afff701e2a9764cfcf9b5e89321b3cc431 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 5 Jun 2009 11:56:18 +0100 Subject: [PATCH] --- yaml --- r: 145495 b: refs/heads/master c: e9e10124e269a39de089c5e0d9936fae2ff889b2 h: refs/heads/master i: 145493: 80c23bd371dd9e2caec30835c857058e09aff749 145491: 85e1a74cfb7fc39393a50fa523e5cebc5548a84e 145487: 8b0d271f65ebc4e68862cb5c357e11f4f6c6b9bf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-queue.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2d1527093168..5d7f8be101de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edaba2c5334492f82d39ec35637c6dea5176a977 +refs/heads/master: e9e10124e269a39de089c5e0d9936fae2ff889b2 diff --git a/trunk/drivers/media/video/ivtv/ivtv-queue.c b/trunk/drivers/media/video/ivtv/ivtv-queue.c index ff7b7deded4f..7fde36e6d227 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-queue.c +++ b/trunk/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); }