summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-fileops.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 14:51:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 14:51:08 -0300
commitb0c4835ca205296ee6352bbe885582e2c546e2ce (patch)
tree44b80aaeb882ec990e143c72472e45b0f1a82cb4 /linux/drivers/media/video/ivtv/ivtv-fileops.c
parente92f78bc63e71d1572225b93b4ea0c31e6e6efc0 (diff)
parentaec12fb2da90fde6ec9056cec90f9a65a8b02305 (diff)
downloadmediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.gz
mediapointer-dvb-s2-b0c4835ca205296ee6352bbe885582e2c546e2ce.tar.bz2
apply backout changeset
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-fileops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c
index f2fa434b6..db813e071 100644
--- a/linux/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c
@@ -587,7 +587,7 @@ retry:
since we may get here before the stream has been fully set-up */
if (mode == OUT_YUV && s->q_full.length == 0 && itv->dma_data_req_size) {
while (count >= itv->dma_data_req_size) {
- if (!ivtv_yuv_udma_stream_frame (itv, (void *)user_buf)) {
+ if (!ivtv_yuv_udma_stream_frame (itv, (void __user *)user_buf)) {
bytes_written += itv->dma_data_req_size;
user_buf += itv->dma_data_req_size;
count -= itv->dma_data_req_size;