diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-11 14:07:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-11 14:07:19 -0400 |
commit | bf3b202b41999f88f091632f13842b7234bd58b7 (patch) | |
tree | e2861fcca522cc299e6106fa6c78d85a4a6eedeb /drivers/media/pci/cx23885 | |
parent | 782cd9ee985b1523f1ddad57657a24d7855d9e4d (diff) | |
parent | 1fdead8ad31d3aa833bc37739273fcde89ace93c (diff) |
Merge branch 'staging/for_v3.7' into v4l_for_linus
Applied on the top of changeset 782cd9e, as some of those patches
depend on some fixes that went via -arm tree.
* staging/for_v3.7: (109 commits)
[media] m5mols: Add missing #include <linux/sizes.h>
[media] stk1160: Add support for S-Video input
Revert "[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check"
[media] dvb: LNA implementation changes
[media] v4l2-ioctl: fix W=1 warnings
[media] v4l2-ioctl: add blocks check for VIDIOC_SUBDEV_G/S_EDID
[media] omap3isp: Fix compilation error in ispreg.h
[media] rc-msi-digivox-ii: Add full scan keycodes
[media] cx25821: testing the wrong variable
[media] tda18271-common: hold the I2C adapter during write transfers
[media] ds3000: add module parameter to force firmware upload
[media] drivers/media: Remove unnecessary semicolon
[media] winbond: remove space from driver name
[media] iguanair: cannot send data from the stack
[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
[media] dvb-usb: print small buffers via %*ph
[media] uvc: Add return code check at vb2_queue_init()
[media] em28xx: Replace memcpy with struct assignment
[media] bt8xx: Add video4linux control V4L2_CID_COLOR_KILLER
[media] mem2mem_testdev: Use devm_kzalloc() in probe
...
Diffstat (limited to 'drivers/media/pci/cx23885')
-rw-r--r-- | drivers/media/pci/cx23885/altera-ci.c | 4 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cimax2.c | 2 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-cards.c | 3 | ||||
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-video.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/pci/cx23885/altera-ci.c b/drivers/media/pci/cx23885/altera-ci.c index aee7f0dacff1..495781ee4711 100644 --- a/drivers/media/pci/cx23885/altera-ci.c +++ b/drivers/media/pci/cx23885/altera-ci.c | |||
@@ -416,7 +416,7 @@ static void netup_read_ci_status(struct work_struct *work) | |||
416 | DVB_CA_EN50221_POLL_CAM_READY : 0); | 416 | DVB_CA_EN50221_POLL_CAM_READY : 0); |
417 | ci_dbg_print("%s: setting CI[1] status = 0x%x\n", | 417 | ci_dbg_print("%s: setting CI[1] status = 0x%x\n", |
418 | __func__, inter->state[1]->status); | 418 | __func__, inter->state[1]->status); |
419 | }; | 419 | } |
420 | 420 | ||
421 | if (inter->state[0] != NULL) { | 421 | if (inter->state[0] != NULL) { |
422 | inter->state[0]->status = | 422 | inter->state[0]->status = |
@@ -425,7 +425,7 @@ static void netup_read_ci_status(struct work_struct *work) | |||
425 | DVB_CA_EN50221_POLL_CAM_READY : 0); | 425 | DVB_CA_EN50221_POLL_CAM_READY : 0); |
426 | ci_dbg_print("%s: setting CI[0] status = 0x%x\n", | 426 | ci_dbg_print("%s: setting CI[0] status = 0x%x\n", |
427 | __func__, inter->state[0]->status); | 427 | __func__, inter->state[0]->status); |
428 | }; | 428 | } |
429 | } | 429 | } |
430 | 430 | ||
431 | /* CI irq handler */ | 431 | /* CI irq handler */ |
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c index c9f15d6dec40..6617774a326a 100644 --- a/drivers/media/pci/cx23885/cimax2.c +++ b/drivers/media/pci/cx23885/cimax2.c | |||
@@ -193,7 +193,7 @@ int netup_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, | |||
193 | 0, &store, 1); | 193 | 0, &store, 1); |
194 | if (ret != 0) | 194 | if (ret != 0) |
195 | return ret; | 195 | return ret; |
196 | }; | 196 | } |
197 | state->current_ci_flag = flag; | 197 | state->current_ci_flag = flag; |
198 | 198 | ||
199 | mutex_lock(&dev->gpio_lock); | 199 | mutex_lock(&dev->gpio_lock); |
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c index 39a4a4b9ed7e..5acdf954ff6b 100644 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c | |||
@@ -542,11 +542,13 @@ struct cx23885_board cx23885_boards[] = { | |||
542 | { | 542 | { |
543 | .type = CX23885_VMUX_COMPOSITE1, | 543 | .type = CX23885_VMUX_COMPOSITE1, |
544 | .vmux = CX25840_COMPOSITE8, | 544 | .vmux = CX25840_COMPOSITE8, |
545 | .amux = CX25840_AUDIO7, | ||
545 | }, | 546 | }, |
546 | { | 547 | { |
547 | .type = CX23885_VMUX_SVIDEO, | 548 | .type = CX23885_VMUX_SVIDEO, |
548 | .vmux = CX25840_SVIDEO_LUMA3 | | 549 | .vmux = CX25840_SVIDEO_LUMA3 | |
549 | CX25840_SVIDEO_CHROMA4, | 550 | CX25840_SVIDEO_CHROMA4, |
551 | .amux = CX25840_AUDIO7, | ||
550 | }, | 552 | }, |
551 | { | 553 | { |
552 | .type = CX23885_VMUX_COMPONENT, | 554 | .type = CX23885_VMUX_COMPONENT, |
@@ -554,6 +556,7 @@ struct cx23885_board cx23885_boards[] = { | |||
554 | CX25840_VIN1_CH1 | | 556 | CX25840_VIN1_CH1 | |
555 | CX25840_VIN6_CH2 | | 557 | CX25840_VIN6_CH2 | |
556 | CX25840_VIN7_CH3, | 558 | CX25840_VIN7_CH3, |
559 | .amux = CX25840_AUDIO7, | ||
557 | }, | 560 | }, |
558 | }, | 561 | }, |
559 | }, | 562 | }, |
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 8c4a9a5f9a50..1a21926ca412 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c | |||
@@ -508,7 +508,8 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input) | |||
508 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) || | 508 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1250) || |
509 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) || | 509 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255) || |
510 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) || | 510 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1255_22111) || |
511 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850)) { | 511 | (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1850) || |
512 | (dev->board == CX23885_BOARD_MYGICA_X8507)) { | ||
512 | /* Configure audio routing */ | 513 | /* Configure audio routing */ |
513 | v4l2_subdev_call(dev->sd_cx25840, audio, s_routing, | 514 | v4l2_subdev_call(dev->sd_cx25840, audio, s_routing, |
514 | INPUT(input)->amux, 0, 0); | 515 | INPUT(input)->amux, 0, 0); |