V4L/DVB (13446): ivtv: Add more explicit detection of known IR devices for Hauppauge...

[mv-sheeva.git] / drivers / media / video / ivtv / ivtv-driver.c

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index d14f94e254bb773804f158b486748880fdae3b06..347c3344f56d4143975c2e6445227d9ee5fbec6c 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -885,7 +885,8 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
        }
 
        /* probe for legacy IR controllers that aren't in card definitions */
-       ivtv_i2c_new_ir_legacy(itv);
+       if ((itv->hw_flags & IVTV_HW_IR_ANY) == 0)
+               ivtv_i2c_new_ir_legacy(itv);
 
        if (itv->card->hw_all & IVTV_HW_CX25840)
                itv->sd_video = ivtv_find_hw(itv, IVTV_HW_CX25840);