V4L/DVB (5905): ivtv-fb: Use proper ioctl value

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/ivtv/ivtv-fb.c b/drivers/media/video/ivtv/ivtv-fb.c
index 01cd65328e8aaa30ad334c29f3de5d907bea38f3..55265bd5c2505e7ec75832bd846138177900ccea 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-fb.c
+++ b/drivers/media/video/ivtv/ivtv-fb.c
@@ -424,10 +424,10 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
                        finish_wait(&itv->vsync_waitq, &wait);
                        return rc;
 
-               case IVTVFB_IOCTL_PREP_FRAME: {
-                       struct ivtvfb_ioctl_dma_host_to_ivtv_args args;
+               case IVTVFB_IOC_DMA_FRAME: {
+                       struct ivtvfb_dma_frame args;
 
-                       IVTV_FB_DEBUG_INFO("IVTVFB_IOCTL_PREP_FRAME\n");
+                       IVTV_FB_DEBUG_INFO("IVTVFB_IOC_DMA_FRAME\n");
                        if (copy_from_user(&args, (void __user *)arg, sizeof(args)))
                                return -EFAULT;
 

diff --git a/include/media/ivtv-fb.h b/include/media/ivtv-fb.h
index 902b2f3d3cb6f3ef7a618ac512be7726968ed1d6..3b746f5e3c9e58712bd7306b35e4191bcdc5e4ef 100644 (file)
--- a/include/media/ivtv-fb.h
+++ b/include/media/ivtv-fb.h
@@ -23,13 +23,12 @@
 
 /* Framebuffer external API */
 
-struct ivtvfb_ioctl_dma_host_to_ivtv_args {
+struct ivtvfb_dma_frame {
        void __user *source;
        unsigned long dest_offset;
        int count;
 };
 
-/* Framebuffer ioctls should use the range 1 - 28 */
-#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args)
+#define IVTVFB_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)
 
 #endif