diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 09:19:06 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 08:48:10 -0400 |
| commit | 26811ae03539c24c618ce989abecb6e62a908e79 (patch) | |
| tree | 54874088b45261c704ae65ab22d81ac5a9ae2d9f /drivers/media/i2c/tvp5150.c | |
| parent | f41c4332cfeae59e78aeda6c4eb9d0f4d42adbf2 (diff) | |
[media] tvp5150: fix s_std support
- do exact matching for special formats like PAL-M
- drop autodetect support: it's non-standard, and it is bogus as well since there
is no way to get back the detected standard since neither g_std nor querystd are
implemented.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/i2c/tvp5150.c')
| -rw-r--r-- | drivers/media/i2c/tvp5150.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index bef528233f7e..89c0b13463b7 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c | |||
| @@ -726,13 +726,11 @@ static int tvp5150_set_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
| 726 | 726 | ||
| 727 | /* First tests should be against specific std */ | 727 | /* First tests should be against specific std */ |
| 728 | 728 | ||
| 729 | if (std == V4L2_STD_ALL) { | 729 | if (std == V4L2_STD_NTSC_443) { |
| 730 | fmt = VIDEO_STD_AUTO_SWITCH_BIT; /* Autodetect mode */ | ||
| 731 | } else if (std & V4L2_STD_NTSC_443) { | ||
| 732 | fmt = VIDEO_STD_NTSC_4_43_BIT; | 730 | fmt = VIDEO_STD_NTSC_4_43_BIT; |
| 733 | } else if (std & V4L2_STD_PAL_M) { | 731 | } else if (std == V4L2_STD_PAL_M) { |
| 734 | fmt = VIDEO_STD_PAL_M_BIT; | 732 | fmt = VIDEO_STD_PAL_M_BIT; |
| 735 | } else if (std & (V4L2_STD_PAL_N | V4L2_STD_PAL_Nc)) { | 733 | } else if (std == V4L2_STD_PAL_N || std == V4L2_STD_PAL_Nc) { |
| 736 | fmt = VIDEO_STD_PAL_COMBINATION_N_BIT; | 734 | fmt = VIDEO_STD_PAL_COMBINATION_N_BIT; |
| 737 | } else { | 735 | } else { |
| 738 | /* Then, test against generic ones */ | 736 | /* Then, test against generic ones */ |