diff options
| author | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-08-25 15:53:14 +0000 |
| commit | 13cc5c3d863d8cd61a10bea470bef19c50730217 (patch) | |
| tree | a88d8189d02769ab095fe1d2d229c9ddbc746c63 /linux/drivers/media/video/video-buf.c | |
| parent | 6550ed72a57b714bfb1a718538d1fb5c542aa470 (diff) | |
| download | mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.gz mediapointer-dvb-s2-13cc5c3d863d8cd61a10bea470bef19c50730217.tar.bz2 | |
- merge 2.6.9-rc1 changes (mostly __user stuff).
Diffstat (limited to 'linux/drivers/media/video/video-buf.c')
| -rw-r--r-- | linux/drivers/media/video/video-buf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c index b3d64a6aa..35c9ea9b3 100644 --- a/linux/drivers/media/video/video-buf.c +++ b/linux/drivers/media/video/video-buf.c @@ -186,7 +186,7 @@ int videobuf_dma_init_overlay(struct videobuf_dmabuf *dma, int direction, dma->direction = direction; if (0 == addr) return -EINVAL; - + dma->bus_addr = addr; dma->nr_pages = nr_pages; return 0; @@ -745,7 +745,7 @@ int videobuf_streamoff(struct file *file, struct videobuf_queue *q) static ssize_t videobuf_read_zerocopy(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos) + char __user *data, size_t count, loff_t *ppos) { enum v4l2_field field; unsigned long flags; @@ -787,7 +787,7 @@ videobuf_read_zerocopy(struct file *file, struct videobuf_queue *q, } ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos) + char __user *data, size_t count, loff_t *ppos) { enum v4l2_field field; unsigned long flags; @@ -911,7 +911,7 @@ void videobuf_read_stop(struct file *file, struct videobuf_queue *q) } ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q, - char *data, size_t count, loff_t *ppos, + char __user *data, size_t count, loff_t *ppos, int vbihack) { unsigned int *fc, bytes; |