diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-07 11:44:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-07 11:44:24 -0300 |
| commit | ff46ee4712cba0b0c55a2524553637e9c08120de (patch) | |
| tree | 64440996604bb889af7af0efead3ae2ea9be72ac /linux/drivers/media | |
| parent | 947f284c7dc18faba8d0be50cd97882f78a47f5c (diff) | |
| parent | 865f39c35bb37e04e5c526900ee8f0e8d671460b (diff) | |
| download | mediapointer-dvb-s2-ff46ee4712cba0b0c55a2524553637e9c08120de.tar.gz mediapointer-dvb-s2-ff46ee4712cba0b0c55a2524553637e9c08120de.tar.bz2 | |
merge: /home/v4l/tmp/newpatches/hg_v4l-dvb_2.patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-i2c.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.c b/linux/drivers/media/video/cx18/cx18-cards.c index bb45bcf68..0caae1a5e 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.c +++ b/linux/drivers/media/video/cx18/cx18-cards.c @@ -196,7 +196,7 @@ static const struct cx18_card_pci_info cx18_pci_mpc718[] = { static const struct cx18_card cx18_card_mpc718 = { .type = CX18_CARD_YUAN_MPC718, .name = "Yuan MPC718", - .comment = "Some Composite and S-Video inputs are currently working.\n", + .comment = "Analog video capture works; some audio line in may not.\n", .v4l2_capabilities = CX18_CAP_ENCODER, .hw_audio_ctrl = CX18_HW_CX23418, .hw_all = CX18_HW_TUNER, @@ -229,7 +229,7 @@ static const struct cx18_card cx18_card_mpc718 = { .tune_lane = 0, .initial_emrs = 2, }, - .xceive_pin = 15, + .xceive_pin = 0, .pci_list = cx18_pci_mpc718, .i2c = &cx18_i2c_std, }; diff --git a/linux/drivers/media/video/cx18/cx18-i2c.c b/linux/drivers/media/video/cx18/cx18-i2c.c index 5b8550e0e..f6b7289db 100644 --- a/linux/drivers/media/video/cx18/cx18-i2c.c +++ b/linux/drivers/media/video/cx18/cx18-i2c.c @@ -439,6 +439,7 @@ int init_cx18_i2c(struct cx18 *cx) write_reg_sync(0x00c000c0, 0xc7001c); mdelay(10); write_reg_sync(0x00c00000, 0xc7001c); + mdelay(10); write_reg_sync(0x00c00000, 0xc730c8); /* Set to edge-triggered intrs. */ write_reg_sync(0x00c00000, 0xc730c4); /* Clear any stale intrs */ |