diff options
| author | Hugo Grostabussiat | 2018-04-08 23:11:59 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-05-04 12:50:49 +0200 |
| commit | a8b48e224cad4ca39a147db282ec12d57336bb08 (patch) | |
| tree | 2e15dcfe8c4496b32cb0d35f056799acf3281496 | |
| parent | media: usbtv: Use V4L2 defines to select capture resolution (diff) | |
| download | kernel-qcow2-linux-a8b48e224cad4ca39a147db282ec12d57336bb08.tar.gz kernel-qcow2-linux-a8b48e224cad4ca39a147db282ec12d57336bb08.tar.xz kernel-qcow2-linux-a8b48e224cad4ca39a147db282ec12d57336bb08.zip | |
media: usbtv: Keep norm parameter specific
The user-supplied norm value gets overwritten by the generic .norm
member from the norm_params. That way, we lose the specific norm the
user may want to set.
For instance, if the user specifies V4L2_STD_PAL_60, the value actually
used will be V4L2_STD_525_60, which in the end will be as if the user
had specified V4L2_STD_NTSC, since this is always the first bitfield we
match the norm value against before configuring the hardware.
The norm_params array is only there to match a norm with an output
resolution. The norm value itself should not be changed.
Signed-off-by: Hugo Grostabussiat <bonstra@bonstra.fr.eu.org>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/usb/usbtv/usbtv-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c index 29e245083247..6cad50d1e5f8 100644 --- a/drivers/media/usb/usbtv/usbtv-video.c +++ b/drivers/media/usb/usbtv/usbtv-video.c @@ -77,7 +77,7 @@ static int usbtv_configure_for_norm(struct usbtv *usbtv, v4l2_std_id norm) usbtv->height = params->cap_height; usbtv->n_chunks = usbtv->width * usbtv->height / 4 / USBTV_CHUNK; - usbtv->norm = params->norm; + usbtv->norm = norm; } else ret = -EINVAL; |