Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da1b1aea authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarAlexandre Courbot <acourbot@chromium.org>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f23317ad

drivers/media/dvb-frontends/rtl2832_sdr.c

+3 −2
Original line number Diff line number Diff line
@@ -1394,7 +1394,8 @@ static int rtl2832_sdr_probe(struct platform_device *pdev) 
	case RTL2832_SDR_TUNER_E4000:

		v4l2_ctrl_handler_init(&dev->hdl, 9);

		if (subdev)

			v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler, NULL);

			v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler,

					      NULL, true);

		break;

	case RTL2832_SDR_TUNER_R820T:

	case RTL2832_SDR_TUNER_R828D:
@@ -1423,7 +1424,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev) 
		v4l2_ctrl_handler_init(&dev->hdl, 2);

		if (subdev)

			v4l2_ctrl_add_handler(&dev->hdl, subdev->ctrl_handler,

					      NULL);

					      NULL, true);

		break;

	default:

		v4l2_ctrl_handler_init(&dev->hdl, 0);

drivers/media/pci/bt8xx/bttv-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -4211,7 +4211,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id) 
	/* register video4linux + input */

	if (!bttv_tvcards[btv->c.type].no_video) {

		v4l2_ctrl_add_handler(&btv->radio_ctrl_handler, hdl,

				v4l2_ctrl_radio_filter);

				v4l2_ctrl_radio_filter, false);

		if (btv->radio_ctrl_handler.error) {

			result = btv->radio_ctrl_handler.error;

			goto fail2;

drivers/media/pci/cx23885/cx23885-417.c

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ int cx23885_417_register(struct cx23885_dev *dev) 
	dev->cxhdl.priv = dev;

	dev->cxhdl.func = cx23885_api_func;

	cx2341x_handler_set_50hz(&dev->cxhdl, tsport->height == 576);

	v4l2_ctrl_add_handler(&dev->ctrl_handler, &dev->cxhdl.hdl, NULL);

	v4l2_ctrl_add_handler(&dev->ctrl_handler, &dev->cxhdl.hdl, NULL, false);



	/* Allocate and initialize V4L video device */

	dev->v4l_device = cx23885_video_dev_alloc(tsport,

drivers/media/pci/cx88/cx88-blackbird.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv) 
	err = cx2341x_handler_init(&dev->cxhdl, 36);

	if (err)

		goto fail_core;

	v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL);

	v4l2_ctrl_add_handler(&dev->cxhdl.hdl, &core->video_hdl, NULL, false);



	/* blackbird stuff */

	pr_info("cx23416 based mpeg encoder (blackbird reference design)\n");

drivers/media/pci/cx88/cx88-video.c

+1 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev, 
		if (vc->id == V4L2_CID_CHROMA_AGC)

			core->chroma_agc = vc;

	}

	v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL);

	v4l2_ctrl_add_handler(&core->video_hdl, &core->audio_hdl, NULL, false);



	/* load and configure helper modules */