diff options
Diffstat (limited to 'drivers/media/video/gspca/tv8532.c')
-rw-r--r-- | drivers/media/video/gspca/tv8532.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c index 8561234d65e2..f9bffd67991e 100644 --- a/drivers/media/video/gspca/tv8532.c +++ b/drivers/media/video/gspca/tv8532.c | |||
@@ -22,8 +22,8 @@ | |||
22 | 22 | ||
23 | #include "gspca.h" | 23 | #include "gspca.h" |
24 | 24 | ||
25 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 4) | 25 | #define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 1, 5) |
26 | static const char version[] = "2.1.4"; | 26 | static const char version[] = "2.1.5"; |
27 | 27 | ||
28 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); | 28 | MODULE_AUTHOR("Michel Xhaard <mxhaard@users.sourceforge.net>"); |
29 | MODULE_DESCRIPTION("TV8532 USB Camera Driver"); | 29 | MODULE_DESCRIPTION("TV8532 USB Camera Driver"); |
@@ -81,9 +81,17 @@ static struct ctrl sd_ctrls[] = { | |||
81 | }, | 81 | }, |
82 | }; | 82 | }; |
83 | 83 | ||
84 | static struct cam_mode sif_mode[] = { | 84 | static struct v4l2_pix_format sif_mode[] = { |
85 | {V4L2_PIX_FMT_SBGGR8, 176, 144, 1}, | 85 | {176, 144, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, |
86 | {V4L2_PIX_FMT_SBGGR8, 352, 288, 0}, | 86 | .bytesperline = 176, |
87 | .sizeimage = 176 * 144, | ||
88 | .colorspace = V4L2_COLORSPACE_SRGB, | ||
89 | .priv = 1}, | ||
90 | {352, 288, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE, | ||
91 | .bytesperline = 352, | ||
92 | .sizeimage = 352 * 288, | ||
93 | .colorspace = V4L2_COLORSPACE_SRGB, | ||
94 | .priv = 0}, | ||
87 | }; | 95 | }; |
88 | 96 | ||
89 | /* | 97 | /* |
@@ -440,7 +448,7 @@ static void sd_start(struct gspca_dev *gspca_dev) | |||
440 | /************************************************/ | 448 | /************************************************/ |
441 | data = TESTCOMP; /* 0x72 compressed mode */ | 449 | data = TESTCOMP; /* 0x72 compressed mode */ |
442 | reg_w(dev, TV8532_QUANT_COMP, &data, 1); /* 0x28 */ | 450 | reg_w(dev, TV8532_QUANT_COMP, &data, 1); /* 0x28 */ |
443 | if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].mode) { | 451 | if (gspca_dev->cam.cam_mode[(int) gspca_dev->curr_mode].priv) { |
444 | /* 176x144 */ | 452 | /* 176x144 */ |
445 | data = QCIFLINE; /* 0x84; // CIF | 4 packet */ | 453 | data = QCIFLINE; /* 0x84; // CIF | 4 packet */ |
446 | reg_w(dev, TV8532_MODE_PACKET, &data, 1); /* 0x29 */ | 454 | reg_w(dev, TV8532_MODE_PACKET, &data, 1); /* 0x29 */ |