diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 08b762951759..e8e5921cdc34 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c | |||
@@ -902,18 +902,19 @@ static void ivtv_load_and_init_modules(struct ivtv *itv) | |||
902 | } | 902 | } |
903 | 903 | ||
904 | if (hw & IVTV_HW_SAA711X) { | 904 | if (hw & IVTV_HW_SAA711X) { |
905 | struct v4l2_chip_ident v = { V4L2_CHIP_MATCH_I2C_DRIVER, I2C_DRIVERID_SAA711X }; | 905 | struct v4l2_dbg_chip_ident v; |
906 | 906 | ||
907 | /* determine the exact saa711x model */ | 907 | /* determine the exact saa711x model */ |
908 | itv->hw_flags &= ~IVTV_HW_SAA711X; | 908 | itv->hw_flags &= ~IVTV_HW_SAA711X; |
909 | 909 | ||
910 | v.match.type = V4L2_CHIP_MATCH_I2C_DRIVER; | ||
911 | strlcpy(v.match.name, "saa7115", sizeof(v.match.name)); | ||
910 | ivtv_call_hw(itv, IVTV_HW_SAA711X, core, g_chip_ident, &v); | 912 | ivtv_call_hw(itv, IVTV_HW_SAA711X, core, g_chip_ident, &v); |
911 | if (v.ident == V4L2_IDENT_SAA7114) { | 913 | if (v.ident == V4L2_IDENT_SAA7114) { |
912 | itv->hw_flags |= IVTV_HW_SAA7114; | 914 | itv->hw_flags |= IVTV_HW_SAA7114; |
913 | /* VBI is not yet supported by the saa7114 driver. */ | 915 | /* VBI is not yet supported by the saa7114 driver. */ |
914 | itv->v4l2_cap &= ~(V4L2_CAP_SLICED_VBI_CAPTURE|V4L2_CAP_VBI_CAPTURE); | 916 | itv->v4l2_cap &= ~(V4L2_CAP_SLICED_VBI_CAPTURE|V4L2_CAP_VBI_CAPTURE); |
915 | } | 917 | } else { |
916 | else { | ||
917 | itv->hw_flags |= IVTV_HW_SAA7115; | 918 | itv->hw_flags |= IVTV_HW_SAA7115; |
918 | } | 919 | } |
919 | itv->vbi.raw_decoder_line_size = 1443; | 920 | itv->vbi.raw_decoder_line_size = 1443; |