-stable review patch. If anyone has any objections, please let us know. ------------------ From: Mauro Carvalho Chehab V4L: Fix SECAM handling on saa7115 (cherry picked from commit a9aaec4e83e687d23b78b38e331bbd6a10b96380) Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Michael Krufky Signed-off-by: Greg Kroah-Hartman --- drivers/media/video/saa7115.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c @@ -960,7 +960,7 @@ static void saa711x_set_v4lstd(struct i2 reg |= 0x10; } else if (std == V4L2_STD_NTSC_M_JP) { reg |= 0x40; - } else if (std == V4L2_STD_SECAM) { + } else if (std & V4L2_STD_SECAM) { reg |= 0x50; } saa711x_write(client, R_0E_CHROMA_CNTL_1, reg); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/