Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / drivers / media / video / pvrusb2 / pvrusb2-v4l2.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index f4c54ef4beaa1fa6ce784a7b952d1e4f413cf028..97e974d9b9c34ba8b215f0a61eb9a04f96e34008 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -28,8 +28,8 @@
 #include "pvrusb2-debug.h"
 #include "pvrusb2-v4l2.h"
 #include "pvrusb2-ioread.h"
-#include <linux/videodev.h>
 #include <linux/videodev2.h>
+#include <media/v4l2-dev.h>
 #include <media/v4l2-common.h>
 
 struct pvr2_v4l2_dev;
@@ -671,7 +671,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
                ret = pvr2_hdw_register_access(
                        hdw,req->i2c_id,req->reg,
                        cmd == VIDIOC_INT_S_REGISTER,&val);
-               if (cmd == 0) req->val = val;
+               if (cmd == VIDIOC_INT_G_REGISTER) req->val = val;
                break;
        }
 #endif