mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
V4L/DVB (4206): Cx88-blackbird: always set encoder height based on tvnorm->id
Removed the switch..case block in blackbird_probe for setting encoder height based on video standard. All blackbird devices can rely on tvnorm->id to retrieve this information from the cx2388x video decoder - tuner_formats should not be used to determine the encoding video standard. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
153962364d
commit
45f87a2173
@ -1045,21 +1045,10 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
|
|||||||
cx2341x_fill_defaults(&dev->params);
|
cx2341x_fill_defaults(&dev->params);
|
||||||
dev->params.port = CX2341X_PORT_STREAMING;
|
dev->params.port = CX2341X_PORT_STREAMING;
|
||||||
|
|
||||||
switch (core->board) {
|
if (core->tvnorm->id & V4L2_STD_525_60) {
|
||||||
case CX88_BOARD_HAUPPAUGE_ROSLYN:
|
dev->height = 480;
|
||||||
if (core->tuner_formats & V4L2_STD_525_60) {
|
} else {
|
||||||
dev->height = 480;
|
dev->height = 576;
|
||||||
} else {
|
|
||||||
dev->height = 576;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
|
|
||||||
if (core->tvnorm->id & V4L2_STD_525_60) {
|
|
||||||
dev->height = 480;
|
|
||||||
} else {
|
|
||||||
dev->height = 576;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
err = cx8802_init_common(dev);
|
err = cx8802_init_common(dev);
|
||||||
|
Loading…
Reference in New Issue
Block a user