diff options
| author | Ondrej Zary | 2013-08-30 22:54:23 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-09-26 12:19:09 +0200 |
| commit | 1966bc2a48f12d5d11c4fbe0880955cc4bfda0f9 (patch) | |
| tree | 6a1c4e50b81e194b1d60f0e62fd566f662b3657a /drivers/media/usb/gspca/cpia1.c | |
| parent | [media] Add HCL T12Rg-H to STK webcam upside-down table (diff) | |
| download | kernel-qcow2-linux-1966bc2a48f12d5d11c4fbe0880955cc4bfda0f9.tar.gz kernel-qcow2-linux-1966bc2a48f12d5d11c4fbe0880955cc4bfda0f9.tar.xz kernel-qcow2-linux-1966bc2a48f12d5d11c4fbe0880955cc4bfda0f9.zip | |
[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/cpia1.c')
| -rw-r--r-- | drivers/media/usb/gspca/cpia1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/cpia1.c b/drivers/media/usb/gspca/cpia1.c index 064b53043b15..f23df4a9d8c5 100644 --- a/drivers/media/usb/gspca/cpia1.c +++ b/drivers/media/usb/gspca/cpia1.c @@ -1553,9 +1553,9 @@ static int sd_start(struct gspca_dev *gspca_dev) sd->params.format.videoSize = VIDEOSIZE_CIF; sd->params.roi.colEnd = sd->params.roi.colStart + - (gspca_dev->width >> 3); + (gspca_dev->pixfmt.width >> 3); sd->params.roi.rowEnd = sd->params.roi.rowStart + - (gspca_dev->height >> 2); + (gspca_dev->pixfmt.height >> 2); /* And now set the camera to a known state */ ret = do_command(gspca_dev, CPIA_COMMAND_SetGrabMode, |