diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-core.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 58e568d7d2ee..c98571c9d5a6 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -254,12 +254,12 @@ void saa7134_pgtable_free(struct pci_dev *pci, struct saa7134_pgtable *pt) | |||
254 | 254 | ||
255 | /* ------------------------------------------------------------------ */ | 255 | /* ------------------------------------------------------------------ */ |
256 | 256 | ||
257 | void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf) | 257 | void saa7134_dma_free(struct videobuf_queue *q,struct saa7134_buf *buf) |
258 | { | 258 | { |
259 | BUG_ON(in_interrupt()); | 259 | BUG_ON(in_interrupt()); |
260 | 260 | ||
261 | videobuf_waiton(&buf->vb,0,0); | 261 | videobuf_waiton(&buf->vb,0,0); |
262 | videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); | 262 | videobuf_dma_unmap(q, &buf->vb.dma); |
263 | videobuf_dma_free(&buf->vb.dma); | 263 | videobuf_dma_free(&buf->vb.dma); |
264 | buf->vb.state = STATE_NEEDS_INIT; | 264 | buf->vb.state = STATE_NEEDS_INIT; |
265 | } | 265 | } |
@@ -960,7 +960,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, | |||
960 | if (saa7134_no_overlay <= 0) { | 960 | if (saa7134_no_overlay <= 0) { |
961 | saa7134_video_template.type |= VID_TYPE_OVERLAY; | 961 | saa7134_video_template.type |= VID_TYPE_OVERLAY; |
962 | } else { | 962 | } else { |
963 | printk("bttv: Overlay support disabled.\n"); | 963 | printk("%s: Overlay support disabled.\n",dev->name); |
964 | } | 964 | } |
965 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); | 965 | dev->video_dev = vdev_init(dev,&saa7134_video_template,"video"); |
966 | err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, | 966 | err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER, |