diff options
Diffstat (limited to 'drivers/media/platform/sh_vou.c')
-rw-r--r-- | drivers/media/platform/sh_vou.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index fa8ae7241521..7a9c5e9329f2 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
@@ -1282,7 +1282,6 @@ static const struct video_device sh_vou_video_template = { | |||
1282 | .fops = &sh_vou_fops, | 1282 | .fops = &sh_vou_fops, |
1283 | .ioctl_ops = &sh_vou_ioctl_ops, | 1283 | .ioctl_ops = &sh_vou_ioctl_ops, |
1284 | .tvnorms = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */ | 1284 | .tvnorms = V4L2_STD_525_60, /* PAL only supported in 8-bit non-bt656 mode */ |
1285 | .current_norm = V4L2_STD_NTSC_M, | ||
1286 | .vfl_dir = VFL_DIR_TX, | 1285 | .vfl_dir = VFL_DIR_TX, |
1287 | }; | 1286 | }; |
1288 | 1287 | ||
@@ -1321,7 +1320,7 @@ static int sh_vou_probe(struct platform_device *pdev) | |||
1321 | pix = &vou_dev->pix; | 1320 | pix = &vou_dev->pix; |
1322 | 1321 | ||
1323 | /* Fill in defaults */ | 1322 | /* Fill in defaults */ |
1324 | vou_dev->std = sh_vou_video_template.current_norm; | 1323 | vou_dev->std = V4L2_STD_NTSC_M; |
1325 | rect->left = 0; | 1324 | rect->left = 0; |
1326 | rect->top = 0; | 1325 | rect->top = 0; |
1327 | rect->width = VOU_MAX_IMAGE_WIDTH; | 1326 | rect->width = VOU_MAX_IMAGE_WIDTH; |