aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-05-21 04:54:36 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-31 11:09:34 -0400
commitda1b1aeac1aced231ac85329112a592dc14d173a (patch)
tree03516d3b41e672110d082ad3c5a240ec526b1f44 /drivers/media/pci/cx88
parentf23317adf6a726b9dbedbe3a0363846f597cc0e8 (diff)
media: v4l2-ctrls: v4l2_ctrl_add_handler: add from_other_dev
Add a 'bool from_other_dev' argument: set to true if the two handlers refer to different devices (e.g. it is true when inheriting controls from a subdev into a main v4l2 bridge driver). This will be used later when implementing support for the request API since we need to skip such controls. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Alexandre Courbot <acourbot@chromium.org> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/pci/cx88')
-rw-r--r--drivers/media/pci/cx88/cx88-blackbird.c2
-rw-r--r--drivers/media/pci/cx88/cx88-video.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 7a4876cf9f08..722dd101c9b0 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -1183,7 +1183,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
1183 err = cx2341x_handler_init(&dev->cxhdl, 36); 1183 err = cx2341x_handler_init(&dev->cxhdl, 36);
1184 if (err) 1184 if (err)
1185 goto fail_core; 1185 goto fail_core;
1186 v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL); 1186 v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL, false);
1187 1187
1188 /* blackbird stuff */ 1188 /* blackbird stuff */
1189 pr_info("cx23416 based mpeg encoder (blackbird reference design)\n"); 1189 pr_info("cx23416 based mpeg encoder (blackbird reference design)\n");
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 7b113bad70d2..85e2b6c9fb1c 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1378,7 +1378,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
1378 if (vc->id == V4L2_CID_CHROMA_AGC) 1378 if (vc->id == V4L2_CID_CHROMA_AGC)
1379 core->chroma_agc = vc; 1379 core->chroma_agc = vc;
1380 } 1380 }
1381 v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL); 1381 v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL, false);
1382 1382
1383 /* load and configure helper modules */ 1383 /* load and configure helper modules */
1384 1384