Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-flexiantxendom0.git] / 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 6811bb9..6d66617 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -228,6 +228,14 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                break;
        }
 
+       case VIDIOC_QUERYSTD:
+       {
+               v4l2_std_id *std = arg;
+               *std = V4L2_STD_ALL;
+               ret = pvr2_hdw_get_detected_std(hdw, std);
+               break;
+       }
+
        case VIDIOC_G_STD:
        {
                int val = 0;