diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-yuv.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-yuv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-yuv.c b/drivers/media/video/ivtv/ivtv-yuv.c index ee91107376c7..7912ed6b72ee 100644 --- a/drivers/media/video/ivtv/ivtv-yuv.c +++ b/drivers/media/video/ivtv/ivtv-yuv.c | |||
@@ -103,7 +103,7 @@ static int ivtv_yuv_prep_user_dma(struct ivtv *itv, struct ivtv_user_dma *dma, | |||
103 | dma->page_count = 0; | 103 | dma->page_count = 0; |
104 | return -ENOMEM; | 104 | return -ENOMEM; |
105 | } | 105 | } |
106 | dma->SG_length = pci_map_sg(itv->dev, dma->SGlist, dma->page_count, PCI_DMA_TODEVICE); | 106 | dma->SG_length = pci_map_sg(itv->pdev, dma->SGlist, dma->page_count, PCI_DMA_TODEVICE); |
107 | 107 | ||
108 | /* Fill SG Array with new values */ | 108 | /* Fill SG Array with new values */ |
109 | ivtv_udma_fill_sg_array(dma, y_buffer_offset, uv_buffer_offset, y_size); | 109 | ivtv_udma_fill_sg_array(dma, y_buffer_offset, uv_buffer_offset, y_size); |
@@ -910,7 +910,7 @@ static void ivtv_yuv_init(struct ivtv *itv) | |||
910 | /* We need a buffer for blanking when Y plane is offset - non-fatal if we can't get one */ | 910 | /* We need a buffer for blanking when Y plane is offset - non-fatal if we can't get one */ |
911 | yi->blanking_ptr = kzalloc(720 * 16, GFP_KERNEL|__GFP_NOWARN); | 911 | yi->blanking_ptr = kzalloc(720 * 16, GFP_KERNEL|__GFP_NOWARN); |
912 | if (yi->blanking_ptr) { | 912 | if (yi->blanking_ptr) { |
913 | yi->blanking_dmaptr = pci_map_single(itv->dev, yi->blanking_ptr, 720*16, PCI_DMA_TODEVICE); | 913 | yi->blanking_dmaptr = pci_map_single(itv->pdev, yi->blanking_ptr, 720*16, PCI_DMA_TODEVICE); |
914 | } else { | 914 | } else { |
915 | yi->blanking_dmaptr = 0; | 915 | yi->blanking_dmaptr = 0; |
916 | IVTV_DEBUG_WARN("Failed to allocate yuv blanking buffer\n"); | 916 | IVTV_DEBUG_WARN("Failed to allocate yuv blanking buffer\n"); |
@@ -1237,7 +1237,7 @@ void ivtv_yuv_close(struct ivtv *itv) | |||
1237 | if (yi->blanking_ptr) { | 1237 | if (yi->blanking_ptr) { |
1238 | kfree(yi->blanking_ptr); | 1238 | kfree(yi->blanking_ptr); |
1239 | yi->blanking_ptr = NULL; | 1239 | yi->blanking_ptr = NULL; |
1240 | pci_unmap_single(itv->dev, yi->blanking_dmaptr, 720*16, PCI_DMA_TODEVICE); | 1240 | pci_unmap_single(itv->pdev, yi->blanking_dmaptr, 720*16, PCI_DMA_TODEVICE); |
1241 | } | 1241 | } |
1242 | 1242 | ||
1243 | /* Invalidate the old dimension information */ | 1243 | /* Invalidate the old dimension information */ |