aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx2341x.c3
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 7cd1c4cf5aec..554813e6f65d 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -639,6 +639,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p)
639{ 639{
640 static struct cx2341x_mpeg_params default_params = { 640 static struct cx2341x_mpeg_params default_params = {
641 /* misc */ 641 /* misc */
642 .port = CX2341X_PORT_MEMORY,
642 .width = 720, 643 .width = 720,
643 .height = 480, 644 .height = 480,
644 .is_50hz = 0, 645 .is_50hz = 0,
@@ -714,7 +715,7 @@ int cx2341x_update(void *priv, cx2341x_mbox_func func,
714 715
715 int err = 0; 716 int err = 0;
716 717
717 cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 1, 0); /* 0 = Memory */ 718 cx2341x_api(priv, func, CX2341X_ENC_SET_OUTPUT_PORT, 2, new->port, 0);
718 719
719 if (old == NULL || old->is_50hz != new->is_50hz) { 720 if (old == NULL || old->is_50hz != new->is_50hz) {
720 err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new->is_50hz); 721 err = cx2341x_api(priv, func, CX2341X_ENC_SET_FRAME_RATE, 1, new->is_50hz);
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 6e945de1f20a..26aac42ca8bd 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1043,6 +1043,7 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
1043 dev->width = 720; 1043 dev->width = 720;
1044 dev->height = 576; 1044 dev->height = 576;
1045 cx2341x_fill_defaults(&dev->params); 1045 cx2341x_fill_defaults(&dev->params);
1046 dev->params.port = CX2341X_PORT_STREAMING;
1046 1047
1047 switch (core->board) { 1048 switch (core->board) {
1048 case CX88_BOARD_HAUPPAUGE_ROSLYN: 1049 case CX88_BOARD_HAUPPAUGE_ROSLYN: