diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/videobuf-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-sg.c | 2 | ||||
-rw-r--r-- | drivers/media/video/videobuf-vmalloc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index c606332512b6..5599a36490fc 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c | |||
@@ -674,7 +674,7 @@ ssize_t videobuf_read_one(struct videobuf_queue *q, | |||
674 | } | 674 | } |
675 | 675 | ||
676 | /* Copy to userspace */ | 676 | /* Copy to userspace */ |
677 | retval=CALL(q,copy_to_user,q,data,count,nonblocking); | 677 | retval=CALL(q,video_copy_to_user,q,data,count,nonblocking); |
678 | if (retval<0) | 678 | if (retval<0) |
679 | goto done; | 679 | goto done; |
680 | 680 | ||
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c index 8bb7fdd306d6..3eb6123227b2 100644 --- a/drivers/media/video/videobuf-dma-sg.c +++ b/drivers/media/video/videobuf-dma-sg.c | |||
@@ -670,7 +670,7 @@ static struct videobuf_qtype_ops pci_ops = { | |||
670 | .sync = __videobuf_sync, | 670 | .sync = __videobuf_sync, |
671 | .mmap_free = __videobuf_mmap_free, | 671 | .mmap_free = __videobuf_mmap_free, |
672 | .mmap_mapper = __videobuf_mmap_mapper, | 672 | .mmap_mapper = __videobuf_mmap_mapper, |
673 | .copy_to_user = __videobuf_copy_to_user, | 673 | .video_copy_to_user = __videobuf_copy_to_user, |
674 | .copy_stream = __videobuf_copy_stream, | 674 | .copy_stream = __videobuf_copy_stream, |
675 | }; | 675 | }; |
676 | 676 | ||
diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c index 2e3689a12a28..cd74341c984f 100644 --- a/drivers/media/video/videobuf-vmalloc.c +++ b/drivers/media/video/videobuf-vmalloc.c | |||
@@ -320,7 +320,7 @@ static struct videobuf_qtype_ops qops = { | |||
320 | .sync = __videobuf_sync, | 320 | .sync = __videobuf_sync, |
321 | .mmap_free = __videobuf_mmap_free, | 321 | .mmap_free = __videobuf_mmap_free, |
322 | .mmap_mapper = __videobuf_mmap_mapper, | 322 | .mmap_mapper = __videobuf_mmap_mapper, |
323 | .copy_to_user = __videobuf_copy_to_user, | 323 | .video_copy_to_user = __videobuf_copy_to_user, |
324 | .copy_stream = __videobuf_copy_stream, | 324 | .copy_stream = __videobuf_copy_stream, |
325 | }; | 325 | }; |
326 | 326 | ||