summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-04-20 00:04:40 -0500
committerMike Isely <isely@pobox.com>2006-04-20 00:04:40 -0500
commit368ee65696f4eacf61a05aceb224c3d37296f4cc (patch)
tree12adf47ca0a3f81ed891b7ed8cb6ef90d0886a0e /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
parent369f3ae0c1361e47201d1cc6cfbd93c0c74fe8bc (diff)
downloadmediapointer-dvb-s2-368ee65696f4eacf61a05aceb224c3d37296f4cc.tar.gz
mediapointer-dvb-s2-368ee65696f4eacf61a05aceb224c3d37296f4cc.tar.bz2
Make NTSC-Mj available in pvrusb2 when hardware reports NTSC-M availability
From: Mike Isely <isely@pobox.com> PVR USB2 models that are NTSC capable are also able to handle the Japanese variant (according to the model info on the device's white sticker). However tveeprom doesn't report this. Work around this for now (and consider getting tveeprom fixed later). Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 6538e886c..350db8dcb 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1375,6 +1375,13 @@ static void pvr2_hdw_setup_std(struct pvr2_hdw *hdw)
std1 = get_default_standard(hdw);
+ // Devices which are NTSC-M capable are also marked as NTSC-Mj
+ // capable on the device's sticker. Reflect that fact here,
+ // because tveeprom doesn't seem to report it.
+ if (hdw->std_mask_eeprom & V4L2_STD_NTSC_M) {
+ hdw->std_mask_eeprom |= V4L2_STD_NTSC_M_JP;
+ }
+
bcnt = pvr2_std_id_to_str(buf,sizeof(buf),hdw->std_mask_eeprom);
pvr2_trace(PVR2_TRACE_INIT,
"Supported video standard(s) reported by eeprom: %.*s",