diff options
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
-rw-r--r-- | drivers/media/video/stk-webcam.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index d37e5e2594b4..ba4fe934ee9e 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -993,6 +993,10 @@ static int stk_vidioc_enum_fmt_cap(struct file *filp, | |||
993 | fmtd->pixelformat = V4L2_PIX_FMT_SBGGR8; | 993 | fmtd->pixelformat = V4L2_PIX_FMT_SBGGR8; |
994 | strcpy(fmtd->description, "Raw bayer"); | 994 | strcpy(fmtd->description, "Raw bayer"); |
995 | break; | 995 | break; |
996 | case 4: | ||
997 | fmtd->pixelformat = V4L2_PIX_FMT_YUYV; | ||
998 | strcpy(fmtd->description, "yuv4:2:2"); | ||
999 | break; | ||
996 | default: | 1000 | default: |
997 | return -EINVAL; | 1001 | return -EINVAL; |
998 | } | 1002 | } |
@@ -1048,6 +1052,7 @@ static int stk_vidioc_try_fmt_cap(struct file *filp, | |||
1048 | case V4L2_PIX_FMT_RGB565: | 1052 | case V4L2_PIX_FMT_RGB565: |
1049 | case V4L2_PIX_FMT_RGB565X: | 1053 | case V4L2_PIX_FMT_RGB565X: |
1050 | case V4L2_PIX_FMT_UYVY: | 1054 | case V4L2_PIX_FMT_UYVY: |
1055 | case V4L2_PIX_FMT_YUYV: | ||
1051 | case V4L2_PIX_FMT_SBGGR8: | 1056 | case V4L2_PIX_FMT_SBGGR8: |
1052 | break; | 1057 | break; |
1053 | default: | 1058 | default: |
@@ -1403,7 +1408,7 @@ static int stk_camera_probe(struct usb_interface *interface, | |||
1403 | dev->vsettings.brightness = 0x7fff; | 1408 | dev->vsettings.brightness = 0x7fff; |
1404 | dev->vsettings.palette = V4L2_PIX_FMT_RGB565; | 1409 | dev->vsettings.palette = V4L2_PIX_FMT_RGB565; |
1405 | dev->vsettings.mode = MODE_VGA; | 1410 | dev->vsettings.mode = MODE_VGA; |
1406 | dev->frame_size = 640*480*2; | 1411 | dev->frame_size = 640 * 480 * 2; |
1407 | 1412 | ||
1408 | INIT_LIST_HEAD(&dev->sio_avail); | 1413 | INIT_LIST_HEAD(&dev->sio_avail); |
1409 | INIT_LIST_HEAD(&dev->sio_full); | 1414 | INIT_LIST_HEAD(&dev->sio_full); |