diff options
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 3 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index 60705b08bfe8..b045874ad04f 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -844,6 +844,9 @@ static int set_tvaudio(struct cx88_core *core) | |||
844 | } else if (V4L2_STD_SECAM_L & norm) { | 844 | } else if (V4L2_STD_SECAM_L & norm) { |
845 | core->tvaudio = WW_L; | 845 | core->tvaudio = WW_L; |
846 | 846 | ||
847 | } else if ((V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H) & norm) { | ||
848 | core->tvaudio = WW_BG; | ||
849 | |||
847 | } else if (V4L2_STD_SECAM_DK & norm) { | 850 | } else if (V4L2_STD_SECAM_DK & norm) { |
848 | core->tvaudio = WW_DK; | 851 | core->tvaudio = WW_DK; |
849 | 852 | ||
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index f4240965be32..f3c26ab6c7c6 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -58,7 +58,8 @@ | |||
58 | V4L2_STD_NTSC_M| V4L2_STD_NTSC_M_JP| V4L2_STD_NTSC_443 | \ | 58 | V4L2_STD_NTSC_M| V4L2_STD_NTSC_M_JP| V4L2_STD_NTSC_443 | \ |
59 | V4L2_STD_PAL_BG| V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \ | 59 | V4L2_STD_PAL_BG| V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \ |
60 | V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \ | 60 | V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \ |
61 | V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK ) | 61 | V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK | \ |
62 | V4L2_STD_SECAM_B| V4L2_STD_SECAM_G | V4L2_STD_SECAM_H ) | ||
62 | 63 | ||
63 | #define FORMAT_FLAGS_PACKED 0x01 | 64 | #define FORMAT_FLAGS_PACKED 0x01 |
64 | #define FORMAT_FLAGS_PLANAR 0x02 | 65 | #define FORMAT_FLAGS_PLANAR 0x02 |