diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2013-08-30 16:54:23 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-09-26 06:19:09 -0400 |
commit | 1966bc2a48f12d5d11c4fbe0880955cc4bfda0f9 (patch) | |
tree | 6a1c4e50b81e194b1d60f0e62fd566f662b3657a /drivers/media/usb/gspca/stk014.c | |
parent | 08149ecf2cbf788b5a0d01481e290f84e4660c06 (diff) |
[media] gspca: store current mode instead of individual parameters
Store complete current mode (struct v4l2_pix_format) in struct gspca_dev
instead of separate pixfmt, width and height parameters.
This is a preparation for variable resolution support.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/usb/gspca/stk014.c')
-rw-r--r-- | drivers/media/usb/gspca/stk014.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/stk014.c b/drivers/media/usb/gspca/stk014.c index 8c0982607f25..b0c70fea760b 100644 --- a/drivers/media/usb/gspca/stk014.c +++ b/drivers/media/usb/gspca/stk014.c | |||
@@ -250,7 +250,8 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
250 | int ret, value; | 250 | int ret, value; |
251 | 251 | ||
252 | /* create the JPEG header */ | 252 | /* create the JPEG header */ |
253 | jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, | 253 | jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height, |
254 | gspca_dev->pixfmt.width, | ||
254 | 0x22); /* JPEG 411 */ | 255 | 0x22); /* JPEG 411 */ |
255 | jpeg_set_qual(sd->jpeg_hdr, QUALITY); | 256 | jpeg_set_qual(sd->jpeg_hdr, QUALITY); |
256 | 257 | ||
@@ -261,7 +262,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
261 | set_par(gspca_dev, 0x00000000); | 262 | set_par(gspca_dev, 0x00000000); |
262 | set_par(gspca_dev, 0x8002e001); | 263 | set_par(gspca_dev, 0x8002e001); |
263 | set_par(gspca_dev, 0x14000000); | 264 | set_par(gspca_dev, 0x14000000); |
264 | if (gspca_dev->width > 320) | 265 | if (gspca_dev->pixfmt.width > 320) |
265 | value = 0x8002e001; /* 640x480 */ | 266 | value = 0x8002e001; /* 640x480 */ |
266 | else | 267 | else |
267 | value = 0x4001f000; /* 320x240 */ | 268 | value = 0x4001f000; /* 320x240 */ |