diff options
| author | Andy Walls <awalls@radix.net> | 2009-11-21 15:41:33 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 21:41:56 +0100 |
| commit | bfbde8ee56d4a19e2d36a5a24b6dbfd298298bf1 (patch) | |
| tree | a51cf805259a3c8661d6261657ed061dc1992d57 /drivers/media/video/ivtv/ivtv-driver.c | |
| parent | V4L/DVB (13442): ivtv: Add module parameter to adjust I2C SCL clock period pe... (diff) | |
| download | linux-bfbde8ee56d4a19e2d36a5a24b6dbfd298298bf1.tar.xz linux-bfbde8ee56d4a19e2d36a5a24b6dbfd298298bf1.zip | |
V4L/DVB (13443): ivtv: Defer legacy I2C IR probing until after setup of known I2C devices
This avoids collisions of legacy IR controller probing with known I2C devices
in the card definitions in ivtv-cards.c. I2C driver modules for device listed
explicitly in a card definition should always take precedence over a probe
guessing where and IR controller may be.
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 8330fb5c7eb3..d14f94e254bb 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -884,6 +884,9 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) itv->hw_flags |= device; } + /* probe for legacy IR controllers that aren't in card definitions */ + ivtv_i2c_new_ir_legacy(itv); + if (itv->card->hw_all & IVTV_HW_CX25840) itv->sd_video = ivtv_find_hw(itv, IVTV_HW_CX25840); else if (itv->card->hw_all & IVTV_HW_SAA717X) |