Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d715e766ddf4786a06abe6a841e956ad8a875963
Commit:     d715e766ddf4786a06abe6a841e956ad8a875963
Parent:     be383bd312c4defab8bd4bde8c06fea5bfe0996b
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 10:30:32 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:03:04 2007 -0300

    V4L/DVB (5905): ivtv-fb: Use proper ioctl value
    
    Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/ivtv/ivtv-fb.c |    6 +++---
 include/media/ivtv-fb.h            |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/ivtv/ivtv-fb.c 
b/drivers/media/video/ivtv/ivtv-fb.c
index 01cd653..55265bd 100644
--- 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 902b2f3..3b746f5 100644
--- 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to