summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/tm6000/tm6000-cards.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-06-03 05:36:44 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 09:35:27 -0300
commit804be2d4933a44ce76bce3d12b09c5db980523a4 (patch)
tree76baf3c58a29268dd9ed2efba4501c7ae204c4a4 /drivers/media/usb/tm6000/tm6000-cards.c
parent28221f88efcf70814491a9695625d8257282d994 (diff)
downloadlinux-804be2d4933a44ce76bce3d12b09c5db980523a4.tar.bz2
[media] tm6000: remove deprecated current_norm
Replace current_norm by g_std. Also initialize the standard to the more common NTSC-M format (which is also what current_norm used). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/tm6000/tm6000-cards.c')
-rw-r--r--drivers/media/usb/tm6000/tm6000-cards.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
index 307d8c5fb7cd..1ccaaddaa307 100644
--- a/drivers/media/usb/tm6000/tm6000-cards.c
+++ b/drivers/media/usb/tm6000/tm6000-cards.c
@@ -1114,7 +1114,7 @@ static int tm6000_init_dev(struct tm6000_core *dev)
/* Default values for STD and resolutions */
dev->width = 720;
dev->height = 480;
- dev->norm = V4L2_STD_PAL_M;
+ dev->norm = V4L2_STD_NTSC_M;
/* Configure tuner */
tm6000_config_tuner(dev);