diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-blackbird.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-blackbird.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 6ec4a34aeacc..75ee8358f1cb 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
| @@ -1686,12 +1686,16 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, | |||
| 1686 | memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); | 1686 | memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); |
| 1687 | memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); | 1687 | memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); |
| 1688 | 1688 | ||
| 1689 | if (core->tuner_formats & V4L2_STD_525_60) { | 1689 | if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) { |
| 1690 | dev->height = 480; | 1690 | |
| 1691 | dev->params.vi_frame_rate = 30; | 1691 | if (core->tuner_formats & V4L2_STD_525_60) { |
| 1692 | } else { | 1692 | dev->height = 480; |
| 1693 | dev->height = 576; | 1693 | dev->params.vi_frame_rate = 30; |
| 1694 | dev->params.vi_frame_rate = 25; | 1694 | } else { |
| 1695 | dev->height = 576; | ||
| 1696 | dev->params.vi_frame_rate = 25; | ||
| 1697 | } | ||
| 1698 | |||
| 1695 | } | 1699 | } |
| 1696 | 1700 | ||
| 1697 | err = cx8802_init_common(dev); | 1701 | err = cx8802_init_common(dev); |