diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:14:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-17 17:14:29 -0200 |
| commit | c2bf3c10a14ccac828d6ce7c3dbc43aeb12bcc9b (patch) | |
| tree | 67009517283e72db45b975791c50d4603ed0f5db /linux/drivers/media/video/saa7115.c | |
| parent | 1b49b5bfe30b45b2b6120ab6a3305fce353fcf1b (diff) | |
| parent | dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395 (diff) | |
| download | mediapointer-dvb-s2-c2bf3c10a14ccac828d6ce7c3dbc43aeb12bcc9b.tar.gz mediapointer-dvb-s2-c2bf3c10a14ccac828d6ce7c3dbc43aeb12bcc9b.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~stoth/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7115.c')
| -rw-r--r-- | linux/drivers/media/video/saa7115.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 064a81334..74c89b458 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -973,7 +973,7 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std) 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); @@ -1505,6 +1505,7 @@ static int saa711x_attach(struct i2c_adapter *adapter, int address, int kind) if (memcmp(name, "1f711", 5)) { v4l_dbg(1, debug, client, "chip found @ 0x%x (ID %s) does not match a known saa711x chip.\n", address << 1, name); + kfree(client); return 0; } |